diff --git a/services/clsi/app.coffee b/services/clsi/app.coffee
index 1061760da3..3e0936279c 100644
--- a/services/clsi/app.coffee
+++ b/services/clsi/app.coffee
@@ -50,10 +50,11 @@ resCacher =
 	body:{}
 	setContentType:"application/json"
 
-do runSmokeTest = ->
-	logger.log("running smoke tests")
-	smokeTest.run(require.resolve(__dirname + "/test/smoke/js/SmokeTests.js"))({}, resCacher)
-	setTimeout(runSmokeTest, 20 * 1000)
+if Settings.smokeTest
+	do runSmokeTest = ->
+		logger.log("running smoke tests")
+		smokeTest.run(require.resolve(__dirname + "/test/smoke/js/SmokeTests.js"))({}, resCacher)
+		setTimeout(runSmokeTest, 20 * 1000)
 
 app.get "/health_check", (req, res)->
 	res.contentType(resCacher?.setContentType)
diff --git a/services/clsi/config/settings.defaults.coffee b/services/clsi/config/settings.defaults.coffee
index 8142a546b6..4169f27540 100644
--- a/services/clsi/config/settings.defaults.coffee
+++ b/services/clsi/config/settings.defaults.coffee
@@ -11,7 +11,6 @@ module.exports =
 			dialect: "sqlite"
 			storage: Path.resolve(__dirname + "/../db.sqlite")
 
-
 	path:
 		compilesDir:  Path.resolve(__dirname + "/../compiles")
 		clsiCacheDir: Path.resolve(__dirname + "/../cache")
@@ -36,5 +35,5 @@ module.exports =
 	apis:
 		clsi:
 			url: "http://localhost:3013"
-
-
+			
+	smokeTest: false