diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f779b59..5557179 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -24,9 +24,7 @@ jobs:
         pip install -r requirements.txt
         pip install uvicorn
     
-    - name: Start API server
+    - name: Start API server & run tests!
       run: |
         python run
-      
-    - name: Run tests
-      run: python tests
+    
diff --git a/run/__main__.py b/run/__main__.py
index ced6c7d..67b1c0a 100644
--- a/run/__main__.py
+++ b/run/__main__.py
@@ -14,6 +14,7 @@ Runs for production on the speicified port.
 
 import os
 import sys
+import time
 
 port = sys.argv[1] if len(sys.argv) > 1 else 2332
 dev = True
@@ -23,3 +24,10 @@ if 'prod' in sys.argv:
     dev = False
 
 os.system(f'cd api && uvicorn main:app{" --reload" if dev else ""} --host 0.0.0.0 --port {port}')
+
+time.sleep(2)
+
+os.system('python tests')
+
+
+