diff --git a/mattermost.go b/mattermost.go
index 4f53828adc..85263e7373 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -349,15 +349,15 @@ func runJavascriptClientTests() {
 
 func cmdRunClientTests() {
 	if flagCmdRunWebClientTests {
-		setupClientTests()
 		api.StartServer()
+		setupClientTests()
 		runWebClientTests()
 		api.StopServer()
 	}
 
 	if flagCmdRunJavascriptClientTests {
-		setupClientTests()
 		api.StartServer()
+		setupClientTests()
 		runJavascriptClientTests()
 		api.StopServer()
 	}