diff --git a/internal/health_test.go b/internal/health_test.go
index 01667b4..6913e3c 100644
--- a/internal/health_test.go
+++ b/internal/health_test.go
@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+	"time"
 )
 
 func TestHealth(t *testing.T) {
@@ -11,14 +12,19 @@ func TestHealth(t *testing.T) {
 	go func() {
 		hs.Start()
 	}()
+
+	// Give the server time to start up
+	time.Sleep(100 * time.Millisecond)
+
 	request, _ := http.NewRequest(http.MethodGet, "http://localhost:8080/health", strings.NewReader(""))
 	resp, err := http.DefaultClient.Do(request)
 
 	if err != nil {
 		t.Errorf("Health endpoint did not start: %v", err)
+		return
 	}
 
-	if resp.StatusCode != http.StatusOK {
+	if resp != nil && resp.StatusCode != http.StatusOK {
 		t.Errorf("Bad response from health endpoint. Want: %d, got %d", http.StatusOK, resp.StatusCode)
 	}
 }