diff --git a/checkport_test.go b/checkport_test.go
index 84a3d9d3e..41c986f1a 100644
--- a/checkport_test.go
+++ b/checkport_test.go
@@ -23,12 +23,13 @@ import (
 	"testing"
 )
 
+// Tests for port availability logic written for server startup sequence.
 func TestCheckPortAvailability(t *testing.T) {
 	tests := []struct {
 		port int
 	}{
-		{9000},
-		{10000},
+		{getFreePort()},
+		{getFreePort()},
 	}
 	for _, test := range tests {
 		// This test should pass if the ports are available