1 files changed, 6 insertions, 14 deletions
diff --git a/mattermost.go b/mattermost.go
index c07c38b2b..ef3d37241 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -363,6 +363,11 @@ type TeamForUpgrade struct {
 
 func setupClientTests() {
 	*utils.Cfg.TeamSettings.EnableOpenServer = true
+	*utils.Cfg.ServiceSettings.EnableCommands = false
+	*utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false
+	*utils.Cfg.ServiceSettings.EnableCustomEmoji = true
+	utils.Cfg.ServiceSettings.EnableIncomingWebhooks = false
+	utils.Cfg.ServiceSettings.EnableOutgoingWebhooks = false
 }
 
 func executeTestCommand(cmd *exec.Cmd) {
@@ -391,24 +396,11 @@ func runWebClientTests() {
 	executeTestCommand(cmd)
 }
 
-func runJavascriptClientTests() {
-	os.Chdir("../mattermost-driver-javascript")
-	cmd := exec.Command("npm", "test")
-	executeTestCommand(cmd)
-}
-
 func cmdRunClientTests() {
 	if flagCmdRunWebClientTests {
-		api.StartServer()
 		setupClientTests()
-		runWebClientTests()
-		api.StopServer()
-	}
-
-	if flagCmdRunJavascriptClientTests {
 		api.StartServer()
-		setupClientTests()
-		runJavascriptClientTests()
+		runWebClientTests()
 		api.StopServer()
 	}
 }