diff --git a/.ci/run_remote_tests.sh b/.ci/run_remote_tests.sh
index 89d798e7..e61e1a23 100755
--- a/.ci/run_remote_tests.sh
+++ b/.ci/run_remote_tests.sh
@@ -98,7 +98,7 @@ function run_sever_submissions() {
         -c log.level=DEBUG \
         "${testing_arg}" &
     local server_pid="$!"
-    sleep 1
+    sleep 5
 
     local error_count=0
 
diff --git a/internal/api/server.go b/internal/api/server.go
index d1b0ff75..7aec67fa 100644
--- a/internal/api/server.go
+++ b/internal/api/server.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
-	"time"
 
 	"github.com/edulinq/autograder/internal/api/core"
 	"github.com/edulinq/autograder/internal/common"
@@ -33,8 +32,6 @@ func StartServer() error {
 		serverErrorChannel <- startAPIServer()
 	}()
 
-	time.Sleep(10 * time.Millisecond)
-
 	go func() {
 		serverErrorChannel <- startUnixServer()
 	}()