diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 356ada35271f9c13be184cf4e57482cf04c8e953..5308b141f6aac81a9b02772f0496147d12fbedc1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ do-build-ubuntu18:
 # Testing
 #
 do-test-ubuntu18:
-  stage: build
+  stage: test
   script:
     - ./cicd_testing/do-test.sh
   tags:
@@ -49,7 +49,7 @@ do-test-ubuntu18:
 # Turbo Fuzzing
 #
 do-fuzz-ubuntu18:
-  stage: build
+  stage: fuzz
   script:
     - ./cicd_testing/do-fuzz.sh
   tags:
@@ -59,7 +59,7 @@ do-fuzz-ubuntu18:
 # Deploy
 #
 do-deploy-ubuntu18:
-  stage: build
+  stage: deploy
   script:
     - ./cicd_testing/do-deploy.sh
   tags:
diff --git a/cicd_testing/do-build.sh b/cicd_testing/do-build.sh
index a0049e3b8a943025e95c8cc601eab5afda60f1f4..02d67435da2668b1ba004d2c602d5e78cc4bd751 100755
--- a/cicd_testing/do-build.sh
+++ b/cicd_testing/do-build.sh
@@ -14,6 +14,5 @@ env|grep CICD
 
 time rsync -a --exclude='.git'  $CICD_TO_TEST_DIR/ /tmp/libehp_test
 cd /tmp/libehp_test
-source set_env_vars
 scons -j 3
 
diff --git a/cicd_testing/do-test.sh b/cicd_testing/do-test.sh
index 2ce5fd7e66072c914bf3dd307a9710e56ed07add..d458f8a6315f2de8b036670b4482363fabdd1d28 100755
--- a/cicd_testing/do-test.sh
+++ b/cicd_testing/do-test.sh
@@ -6,7 +6,9 @@ set -x
 
 function main()
 {
-	cd /tmp/libehp_test/test
+	cd /tmp/libehp_test
+	scons -j3
+	cd test
 	./test.sh
 	exit 0
 }