diff --git a/api/internal/tests/authmethods/authenticate_test.go b/api/authmethods/authenticate_test.go
similarity index 100%
rename from api/internal/tests/authmethods/authenticate_test.go
rename to api/authmethods/authenticate_test.go
diff --git a/api/internal/tests/authtokens/authtoken_test.go b/api/authtokens/authtoken_test.go
similarity index 100%
rename from api/internal/tests/authtokens/authtoken_test.go
rename to api/authtokens/authtoken_test.go
diff --git a/api/internal/tests/groups/group_test.go b/api/groups/group_test.go
similarity index 100%
rename from api/internal/tests/groups/group_test.go
rename to api/groups/group_test.go
diff --git a/api/internal/tests/hosts/host_catalog_test.go b/api/hosts/host_catalog_test.go
similarity index 100%
rename from api/internal/tests/hosts/host_catalog_test.go
rename to api/hosts/host_catalog_test.go
diff --git a/api/internal/genapi/detail_template_test.go b/api/internal/tests/detail_template_test.go
similarity index 97%
rename from api/internal/genapi/detail_template_test.go
rename to api/internal/tests/detail_template_test.go
index 01fdd3d070..ace68f64a2 100644
--- a/api/internal/genapi/detail_template_test.go
+++ b/api/internal/tests/detail_template_test.go
@@ -1,4 +1,4 @@
-package main_test
+package tests
 
 // TODO: Reenable once we reimplement generation of As functions once static hosts lands
 /*
diff --git a/api/internal/tests/roles/role_test.go b/api/roles/role_test.go
similarity index 100%
rename from api/internal/tests/roles/role_test.go
rename to api/roles/role_test.go
diff --git a/api/internal/tests/scopes/project_test.go b/api/scopes/project_test.go
similarity index 100%
rename from api/internal/tests/scopes/project_test.go
rename to api/scopes/project_test.go
diff --git a/api/internal/tests/users/user_test.go b/api/users/user_test.go
similarity index 100%
rename from api/internal/tests/users/user_test.go
rename to api/users/user_test.go