diff --git a/tests/all_tests_waku.nim b/tests/all_tests_waku.nim
index 15a544f89..3ae5d95a7 100644
--- a/tests/all_tests_waku.nim
+++ b/tests/all_tests_waku.nim
@@ -24,7 +24,11 @@ when os == "Linux" and
     # GitHub only supports container actions on Linux
     # and we need to start a postgress database in a docker container
     defined(postgres):
-  import ./waku_archive/test_driver_postgres_query, ./waku_archive/test_driver_postgres
+  import
+    ./waku_archive/test_driver_postgres_query,
+    ./waku_archive/test_driver_postgres,
+    ./factory/test_node_factory,
+    ./wakunode_rest/test_rest_store
 
 # Waku store test suite
 import
@@ -80,7 +84,6 @@ import
   ./wakunode_rest/test_rest_relay,
   ./wakunode_rest/test_rest_relay_serdes,
   ./wakunode_rest/test_rest_serdes,
-  ./wakunode_rest/test_rest_store,
   ./wakunode_rest/test_rest_filter,
   ./wakunode_rest/test_rest_lightpush,
   ./wakunode_rest/test_rest_admin,
@@ -90,4 +93,3 @@ import
 import ./waku_rln_relay/test_all
 
 # Node Factory
-import ./factory/test_node_factory