diff --git a/tests/extensions/__init__.py b/bot/extensions/messages/tests/__init__.py
similarity index 100%
rename from tests/extensions/__init__.py
rename to bot/extensions/messages/tests/__init__.py
diff --git a/tests/extensions/messages/test_fields.py b/bot/extensions/messages/tests/test_fields.py
similarity index 100%
rename from tests/extensions/messages/test_fields.py
rename to bot/extensions/messages/tests/test_fields.py
diff --git a/tests/extensions/messages/test_search_extension.py b/bot/extensions/messages/tests/test_search_extension.py
similarity index 100%
rename from tests/extensions/messages/test_search_extension.py
rename to bot/extensions/messages/tests/test_search_extension.py
diff --git a/tests/extensions/messages/__init__.py b/bot/extensions/weather/tests/__init__.py
similarity index 100%
rename from tests/extensions/messages/__init__.py
rename to bot/extensions/weather/tests/__init__.py
diff --git a/tests/extensions/test_weather_extension.py b/bot/extensions/weather/tests/test_weather_extension.py
similarity index 100%
rename from tests/extensions/test_weather_extension.py
rename to bot/extensions/weather/tests/test_weather_extension.py
diff --git a/bot/extensions/welcome/__init__.py b/bot/extensions/welcome/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/bot/extensions/welcome/tests/__init__.py b/bot/extensions/welcome/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/extensions/test_welcome_extension.py b/bot/extensions/welcome/tests/test_welcome_extension.py
similarity index 96%
rename from tests/extensions/test_welcome_extension.py
rename to bot/extensions/welcome/tests/test_welcome_extension.py
index 668f778..b6ad366 100644
--- a/tests/extensions/test_welcome_extension.py
+++ b/bot/extensions/welcome/tests/test_welcome_extension.py
@@ -1,7 +1,7 @@
 import pytest
 from types import SimpleNamespace
 
-from bot.extensions.welcome_extension import (
+from bot.extensions.welcome.welcome_extension import (
     _is_new_join,
     _member_display_name,
     _welcome,
diff --git a/bot/extensions/welcome_extension.py b/bot/extensions/welcome/welcome_extension.py
similarity index 100%
rename from bot/extensions/welcome_extension.py
rename to bot/extensions/welcome/welcome_extension.py
diff --git a/bot/extensions/wikipedia/__init__.py b/bot/extensions/wikipedia/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/bot/extensions/wikipedia/tests/__init__.py b/bot/extensions/wikipedia/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/extensions/test_wikipedia_extension.py b/bot/extensions/wikipedia/tests/test_wikipedia_extension.py
similarity index 88%
rename from tests/extensions/test_wikipedia_extension.py
rename to bot/extensions/wikipedia/tests/test_wikipedia_extension.py
index 5540547..86573b5 100644
--- a/tests/extensions/test_wikipedia_extension.py
+++ b/bot/extensions/wikipedia/tests/test_wikipedia_extension.py
@@ -2,7 +2,7 @@
 import requests
 from unittest.mock import patch, MagicMock
 
-from bot.extensions.wikipedia_extension import (
+from bot.extensions.wikipedia.wikipedia_extension import (
     _format_results,
     _search_wikipedia,
 )
@@ -43,7 +43,8 @@ def test_search_wikipedia_calls_api_with_correct_params() -> None:
     fake_response.json.return_value = fake_payload
 
     with patch(
-        "bot.extensions.wikipedia_extension.requests.get", return_value=fake_response
+        "bot.extensions.wikipedia.wikipedia_extension.requests.get",
+        return_value=fake_response,
     ) as mock_get:
 
         result = _search_wikipedia("test query")
@@ -70,7 +71,8 @@ def test_search_wikipedia_raises_on_http_error() -> None:
     fake_response.raise_for_status.side_effect = requests.HTTPError("error")
 
     with patch(
-        "bot.extensions.wikipedia_extension.requests.get", return_value=fake_response
+        "bot.extensions.wikipedia.wikipedia_extension.requests.get",
+        return_value=fake_response,
     ):
         with pytest.raises(requests.HTTPError, match="error"):
             _search_wikipedia("python")
@@ -85,7 +87,8 @@ def test_search_wikipedia_raises_on_http_error() -> None:
 )
 def test_search_wikipedia_raises_on_network_error(exception) -> None:
     with patch(
-        "bot.extensions.wikipedia_extension.requests.get", side_effect=exception
+        "bot.extensions.wikipedia.wikipedia_extension.requests.get",
+        side_effect=exception,
     ):
         with pytest.raises(type(exception), match=str(exception)):
             _search_wikipedia("python")
diff --git a/bot/extensions/wikipedia_extension.py b/bot/extensions/wikipedia/wikipedia_extension.py
similarity index 100%
rename from bot/extensions/wikipedia_extension.py
rename to bot/extensions/wikipedia/wikipedia_extension.py
diff --git a/pyproject.toml b/pyproject.toml
index 20f1f92..7c0328f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ ada = "bot.cli:cli"
 include = ["bot*"]
 
 [tool.pytest.ini_options]
-testpaths = ["tests"]
+testpaths = ["tests", "bot"]
 asyncio_mode = "auto"
 
 [tool.mypy]