diff --git a/tests.CMakeLists.txt b/tests.CMakeLists.txt
index 588ac21..a9338e1 100644
--- a/tests.CMakeLists.txt
+++ b/tests.CMakeLists.txt
@@ -1,5 +1,5 @@
 include(CTest)
-file(GLOB sources_tests tests/test_*.cpp)
+file(GLOB sources_tests tests/test_*.cpp tests/*/test_*.cpp)
 
 find_package(Catch2)
 if(Catch2_FOUND)    # Catch 2.x
diff --git a/tests/test_api_v1_accounts.cpp b/tests/api/test_api_v1_accounts.cpp
similarity index 98%
rename from tests/test_api_v1_accounts.cpp
rename to tests/api/test_api_v1_accounts.cpp
index ee3fc33..a2c69bc 100644
--- a/tests/test_api_v1_accounts.cpp
+++ b/tests/api/test_api_v1_accounts.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/token.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id.cpp b/tests/api/test_api_v1_accounts_id.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id.cpp
rename to tests/api/test_api_v1_accounts_id.cpp
index 99c98f0..18ad0df 100644
--- a/tests/test_api_v1_accounts_id.cpp
+++ b/tests/api/test_api_v1_accounts_id.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_block.cpp b/tests/api/test_api_v1_accounts_id_block.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_block.cpp
rename to tests/api/test_api_v1_accounts_id_block.cpp
index 7f2622e..cac5262 100644
--- a/tests/test_api_v1_accounts_id_block.cpp
+++ b/tests/api/test_api_v1_accounts_id_block.cpp
@@ -19,7 +19,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_follow.cpp b/tests/api/test_api_v1_accounts_id_follow.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_follow.cpp
rename to tests/api/test_api_v1_accounts_id_follow.cpp
index 7cc3e7f..f4c3d70 100644
--- a/tests/test_api_v1_accounts_id_follow.cpp
+++ b/tests/api/test_api_v1_accounts_id_follow.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_followers.cpp b/tests/api/test_api_v1_accounts_id_followers.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_followers.cpp
rename to tests/api/test_api_v1_accounts_id_followers.cpp
index 1cf47e6..0f57dde 100644
--- a/tests/test_api_v1_accounts_id_followers.cpp
+++ b/tests/api/test_api_v1_accounts_id_followers.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_following.cpp b/tests/api/test_api_v1_accounts_id_following.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_following.cpp
rename to tests/api/test_api_v1_accounts_id_following.cpp
index e43a34a..2490b17 100644
--- a/tests/test_api_v1_accounts_id_following.cpp
+++ b/tests/api/test_api_v1_accounts_id_following.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_lists.cpp b/tests/api/test_api_v1_accounts_id_lists.cpp
similarity index 97%
rename from tests/test_api_v1_accounts_id_lists.cpp
rename to tests/api/test_api_v1_accounts_id_lists.cpp
index 459fbf1..aeb2838 100644
--- a/tests/test_api_v1_accounts_id_lists.cpp
+++ b/tests/api/test_api_v1_accounts_id_lists.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_pin.cpp b/tests/api/test_api_v1_accounts_id_pin.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_pin.cpp
rename to tests/api/test_api_v1_accounts_id_pin.cpp
index eecfc76..9909a81 100644
--- a/tests/test_api_v1_accounts_id_pin.cpp
+++ b/tests/api/test_api_v1_accounts_id_pin.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_statuses.cpp b/tests/api/test_api_v1_accounts_id_statuses.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_statuses.cpp
rename to tests/api/test_api_v1_accounts_id_statuses.cpp
index 40b4095..7e1b450 100644
--- a/tests/test_api_v1_accounts_id_statuses.cpp
+++ b/tests/api/test_api_v1_accounts_id_statuses.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/status.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_unblock.cpp b/tests/api/test_api_v1_accounts_id_unblock.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_unblock.cpp
rename to tests/api/test_api_v1_accounts_id_unblock.cpp
index 39fd29f..3a3b852 100644
--- a/tests/test_api_v1_accounts_id_unblock.cpp
+++ b/tests/api/test_api_v1_accounts_id_unblock.cpp
@@ -19,7 +19,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_unfollow.cpp b/tests/api/test_api_v1_accounts_id_unfollow.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_unfollow.cpp
rename to tests/api/test_api_v1_accounts_id_unfollow.cpp
index f084444..de98108 100644
--- a/tests/test_api_v1_accounts_id_unfollow.cpp
+++ b/tests/api/test_api_v1_accounts_id_unfollow.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_id_unpin.cpp b/tests/api/test_api_v1_accounts_id_unpin.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_id_unpin.cpp
rename to tests/api/test_api_v1_accounts_id_unpin.cpp
index 3f1a742..3bbf9bd 100644
--- a/tests/test_api_v1_accounts_id_unpin.cpp
+++ b/tests/api/test_api_v1_accounts_id_unpin.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_relationships.cpp b/tests/api/test_api_v1_accounts_relationships.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_relationships.cpp
rename to tests/api/test_api_v1_accounts_relationships.cpp
index 0bdd3b0..4482bb2 100644
--- a/tests/test_api_v1_accounts_relationships.cpp
+++ b/tests/api/test_api_v1_accounts_relationships.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/relationship.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_search.cpp b/tests/api/test_api_v1_accounts_search.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_search.cpp
rename to tests/api/test_api_v1_accounts_search.cpp
index 4622e87..62b101b 100644
--- a/tests/test_api_v1_accounts_search.cpp
+++ b/tests/api/test_api_v1_accounts_search.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_update_credentials.cpp b/tests/api/test_api_v1_accounts_update_credentials.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_update_credentials.cpp
rename to tests/api/test_api_v1_accounts_update_credentials.cpp
index b809b6b..bd8b211 100644
--- a/tests/test_api_v1_accounts_update_credentials.cpp
+++ b/tests/api/test_api_v1_accounts_update_credentials.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_accounts_verify_credentials.cpp b/tests/api/test_api_v1_accounts_verify_credentials.cpp
similarity index 98%
rename from tests/test_api_v1_accounts_verify_credentials.cpp
rename to tests/api/test_api_v1_accounts_verify_credentials.cpp
index 855c296..b755097 100644
--- a/tests/test_api_v1_accounts_verify_credentials.cpp
+++ b/tests/api/test_api_v1_accounts_verify_credentials.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_apps.cpp b/tests/api/test_api_v1_apps.cpp
similarity index 98%
rename from tests/test_api_v1_apps.cpp
rename to tests/api/test_api_v1_apps.cpp
index a275721..68ce81e 100644
--- a/tests/test_api_v1_apps.cpp
+++ b/tests/api/test_api_v1_apps.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/application.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_apps_verify_credentials.cpp b/tests/api/test_api_v1_apps_verify_credentials.cpp
similarity index 98%
rename from tests/test_api_v1_apps_verify_credentials.cpp
rename to tests/api/test_api_v1_apps_verify_credentials.cpp
index 639b2cc..2265f7d 100644
--- a/tests/test_api_v1_apps_verify_credentials.cpp
+++ b/tests/api/test_api_v1_apps_verify_credentials.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/application.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_blocks.cpp b/tests/api/test_api_v1_blocks.cpp
similarity index 98%
rename from tests/test_api_v1_blocks.cpp
rename to tests/api/test_api_v1_blocks.cpp
index 4ccd2b2..ea396dd 100644
--- a/tests/test_api_v1_blocks.cpp
+++ b/tests/api/test_api_v1_blocks.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_custom_emojis.cpp b/tests/api/test_api_v1_custom_emojis.cpp
similarity index 98%
rename from tests/test_api_v1_custom_emojis.cpp
rename to tests/api/test_api_v1_custom_emojis.cpp
index f723c63..5cb057b 100644
--- a/tests/test_api_v1_custom_emojis.cpp
+++ b/tests/api/test_api_v1_custom_emojis.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/emoji.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_domain_blocks.cpp b/tests/api/test_api_v1_domain_blocks.cpp
similarity index 98%
rename from tests/test_api_v1_domain_blocks.cpp
rename to tests/api/test_api_v1_domain_blocks.cpp
index 64a4810..1384878 100644
--- a/tests/test_api_v1_domain_blocks.cpp
+++ b/tests/api/test_api_v1_domain_blocks.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_endorsements.cpp b/tests/api/test_api_v1_endorsements.cpp
similarity index 98%
rename from tests/test_api_v1_endorsements.cpp
rename to tests/api/test_api_v1_endorsements.cpp
index 3eeaf21..a6d4419 100644
--- a/tests/test_api_v1_endorsements.cpp
+++ b/tests/api/test_api_v1_endorsements.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_favourites.cpp b/tests/api/test_api_v1_favourites.cpp
similarity index 98%
rename from tests/test_api_v1_favourites.cpp
rename to tests/api/test_api_v1_favourites.cpp
index f8b6123..bcf5c07 100644
--- a/tests/test_api_v1_favourites.cpp
+++ b/tests/api/test_api_v1_favourites.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/status.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_filters.cpp b/tests/api/test_api_v1_filters.cpp
similarity index 98%
rename from tests/test_api_v1_filters.cpp
rename to tests/api/test_api_v1_filters.cpp
index d08e3bc..fc619f4 100644
--- a/tests/test_api_v1_filters.cpp
+++ b/tests/api/test_api_v1_filters.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/filter.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_filters_id.cpp b/tests/api/test_api_v1_filters_id.cpp
similarity index 99%
rename from tests/test_api_v1_filters_id.cpp
rename to tests/api/test_api_v1_filters_id.cpp
index 390e3d9..b868184 100644
--- a/tests/test_api_v1_filters_id.cpp
+++ b/tests/api/test_api_v1_filters_id.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/filter.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_follow_requests.cpp b/tests/api/test_api_v1_follow_requests.cpp
similarity index 97%
rename from tests/test_api_v1_follow_requests.cpp
rename to tests/api/test_api_v1_follow_requests.cpp
index 187e451..bec7bcd 100644
--- a/tests/test_api_v1_follow_requests.cpp
+++ b/tests/api/test_api_v1_follow_requests.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_follow_requests_authorize.cpp b/tests/api/test_api_v1_follow_requests_authorize.cpp
similarity index 98%
rename from tests/test_api_v1_follow_requests_authorize.cpp
rename to tests/api/test_api_v1_follow_requests_authorize.cpp
index 3e2f486..5f29a59 100644
--- a/tests/test_api_v1_follow_requests_authorize.cpp
+++ b/tests/api/test_api_v1_follow_requests_authorize.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_follow_requests_reject.cpp b/tests/api/test_api_v1_follow_requests_reject.cpp
similarity index 98%
rename from tests/test_api_v1_follow_requests_reject.cpp
rename to tests/api/test_api_v1_follow_requests_reject.cpp
index ab11c36..8f2682d 100644
--- a/tests/test_api_v1_follow_requests_reject.cpp
+++ b/tests/api/test_api_v1_follow_requests_reject.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_instance.cpp b/tests/api/test_api_v1_instance.cpp
similarity index 98%
rename from tests/test_api_v1_instance.cpp
rename to tests/api/test_api_v1_instance.cpp
index 2b930be..1fb6e8e 100644
--- a/tests/test_api_v1_instance.cpp
+++ b/tests/api/test_api_v1_instance.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/instance.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_lists.cpp b/tests/api/test_api_v1_lists.cpp
similarity index 98%
rename from tests/test_api_v1_lists.cpp
rename to tests/api/test_api_v1_lists.cpp
index 1e79e9f..6dafed0 100644
--- a/tests/test_api_v1_lists.cpp
+++ b/tests/api/test_api_v1_lists.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/list.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_lists_id.cpp b/tests/api/test_api_v1_lists_id.cpp
similarity index 98%
rename from tests/test_api_v1_lists_id.cpp
rename to tests/api/test_api_v1_lists_id.cpp
index ebd35ca..c219d5f 100644
--- a/tests/test_api_v1_lists_id.cpp
+++ b/tests/api/test_api_v1_lists_id.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/list.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_lists_id_accounts.cpp b/tests/api/test_api_v1_lists_id_accounts.cpp
similarity index 99%
rename from tests/test_api_v1_lists_id_accounts.cpp
rename to tests/api/test_api_v1_lists_id_accounts.cpp
index 9ceec14..acac553 100644
--- a/tests/test_api_v1_lists_id_accounts.cpp
+++ b/tests/api/test_api_v1_lists_id_accounts.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_media.cpp b/tests/api/test_api_v1_media.cpp
similarity index 98%
rename from tests/test_api_v1_media.cpp
rename to tests/api/test_api_v1_media.cpp
index da517dc..7030572 100644
--- a/tests/test_api_v1_media.cpp
+++ b/tests/api/test_api_v1_media.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/attachment.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_media_id.cpp b/tests/api/test_api_v1_media_id.cpp
similarity index 98%
rename from tests/test_api_v1_media_id.cpp
rename to tests/api/test_api_v1_media_id.cpp
index ef8caf0..aef4c76 100644
--- a/tests/test_api_v1_media_id.cpp
+++ b/tests/api/test_api_v1_media_id.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/attachment.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_statuses_id_favourite.cpp b/tests/api/test_api_v1_statuses_id_favourite.cpp
similarity index 98%
rename from tests/test_api_v1_statuses_id_favourite.cpp
rename to tests/api/test_api_v1_statuses_id_favourite.cpp
index 73b2708..29c28fd 100644
--- a/tests/test_api_v1_statuses_id_favourite.cpp
+++ b/tests/api/test_api_v1_statuses_id_favourite.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/status.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_statuses_id_unfavourite.cpp b/tests/api/test_api_v1_statuses_id_unfavourite.cpp
similarity index 98%
rename from tests/test_api_v1_statuses_id_unfavourite.cpp
rename to tests/api/test_api_v1_statuses_id_unfavourite.cpp
index cb9c059..c0c8bd6 100644
--- a/tests/test_api_v1_statuses_id_unfavourite.cpp
+++ b/tests/api/test_api_v1_statuses_id_unfavourite.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/status.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_suggestions.cpp b/tests/api/test_api_v1_suggestions.cpp
similarity index 98%
rename from tests/test_api_v1_suggestions.cpp
rename to tests/api/test_api_v1_suggestions.cpp
index 445bc83..7496168 100644
--- a/tests/test_api_v1_suggestions.cpp
+++ b/tests/api/test_api_v1_suggestions.cpp
@@ -20,7 +20,7 @@
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
 #include "easy/entities/account.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;
 
diff --git a/tests/test_api_v1_suggestions_accountid.cpp b/tests/api/test_api_v1_suggestions_accountid.cpp
similarity index 97%
rename from tests/test_api_v1_suggestions_accountid.cpp
rename to tests/api/test_api_v1_suggestions_accountid.cpp
index 32d1fc8..45533cf 100644
--- a/tests/test_api_v1_suggestions_accountid.cpp
+++ b/tests/api/test_api_v1_suggestions_accountid.cpp
@@ -19,7 +19,7 @@
 #include <catch.hpp>
 #include "mastodon-cpp.hpp"
 #include "easy/easy.hpp"
-#include "environment_variables.hpp"
+#include "../environment_variables.hpp"
 
 using namespace Mastodon;