diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index d5b779e68..3cf8c1676 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -375,10 +375,15 @@ run go tests cli kafka integration:
   script:
     - echo "running fbsql integration tests"
     - cd ./idk/
-    - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make start-all
+    - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make start-pilosa
+    - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make start-zookeeper
+    - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make start-kafka
+    - BRANCH_NAME=${CI_COMMIT_REF_SLUG} make start-schema-registry
     - cd ..
     - go test -coverprofile=coverage-cli-kafka-integration.out -run -timeout=10m TestKafkaRunner ./cli
   after_script:
+    - cd ./idk/
+    - make shutdown
     - rm -rf /mnt/ramdisk/test-$CI_JOB_ID
   artifacts:
     paths: