diff --git a/tests/server.rs b/tests/server.rs
deleted file mode 100644
index 2c04a24..0000000
--- a/tests/server.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod server {
-    pub mod helpers;
-    pub mod roasters;
-    pub mod roasts;
-}
diff --git a/tests/server/main.rs b/tests/server/main.rs
new file mode 100644
index 0000000..aaff125
--- /dev/null
+++ b/tests/server/main.rs
@@ -0,0 +1,3 @@
+pub mod helpers;
+pub mod roasters;
+pub mod roasts;
diff --git a/tests/server/roasters.rs b/tests/server/roasters.rs
index 6921be4..d415670 100644
--- a/tests/server/roasters.rs
+++ b/tests/server/roasters.rs
@@ -1,4 +1,4 @@
-use crate::server::helpers::spawn_app;
+use crate::helpers::spawn_app;
 use brewlog::domain::roasters::{NewRoaster, Roaster, UpdateRoaster};
 
 #[tokio::test]
diff --git a/tests/server/roasts.rs b/tests/server/roasts.rs
index 92a26a2..582e5e1 100644
--- a/tests/server/roasts.rs
+++ b/tests/server/roasts.rs
@@ -1,13 +1,13 @@
-use crate::server::helpers::spawn_app;
+use crate::helpers::spawn_app;
 use brewlog::domain::roasters::NewRoaster;
 use brewlog::domain::roasts::{NewRoast, Roast, RoastWithRoaster};
 
-async fn create_test_roaster(app: &crate::server::helpers::TestApp) -> String {
+async fn create_test_roaster(app: &crate::helpers::TestApp) -> String {
     create_test_roaster_with_name(app, "Test Roasters").await
 }
 
 async fn create_test_roaster_with_name(
-    app: &crate::server::helpers::TestApp,
+    app: &crate::helpers::TestApp,
     name: &str,
 ) -> String {
     let new_roaster = NewRoaster {