diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e8e49ae7c9cd0c91d0f60d9c972cba2ada9e7f..722c94b5b1b7078966c18d3be1aa28c8bed13e4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,15 +25,15 @@ do-nightly-clean-ubuntu18:
   tags:
     - ubuntu18
 
-#do-nightly-clean-ubuntu16:
-#  <<: *do-nightly-clean
-#  tags:
-#    - ubuntu16
-#
-#do-nightly-clean-centos76:
-#  <<: *do-nightly-clean
-#  tags:
-#    - centos76
+do-nightly-clean-ubuntu16:
+  <<: *do-nightly-clean
+  tags:
+    - ubuntu16
+
+do-nightly-clean-centos76:
+  <<: *do-nightly-clean
+  tags:
+    - centos76
 
 
 #
@@ -49,64 +49,63 @@ do-build-ubuntu18:
   <<: *do-build
   tags:
     - ubuntu18
-#
-#do-build-ubuntu16:
-#  <<: *do-build
-#  tags:
-#    - ubuntu16
-#
-#do-build-centos76:
-#  <<: *do-build
-#  tags:
-#    - centos76
-#
+
+do-build-ubuntu16:
+  <<: *do-build
+  tags:
+    - ubuntu16
+
+do-build-centos76:
+  <<: *do-build
+  tags:
+    - centos76
+
 
 #
 # test_cmds.sh zafl
 #
-#.basic-pgms-zafl: &basic-pgms-zafl
-#  stage: test
-#  script:
-#    - ./cicd_testing/basic-pgms-zafl.sh
-
-#basic-pgms-zafl-ubuntu18:
-#  <<: *basic-pgms-zafl
-#  tags:
-#    - ubuntu18
-
-#basic-pgms-zafl-ubuntu16:
-#  <<: *basic-pgms-zafl
-#  tags:
-#    - ubuntu16
-#
-#basic-pgms-zafl-centos76:
-#  <<: *basic-pgms-zafl
-#  tags:
-#    - centos76
+.basic-pgms-zafl: &basic-pgms-zafl
+  stage: test
+  script:
+    - ./cicd_testing/basic-pgms-zafl.sh
+
+basic-pgms-zafl-ubuntu18:
+  <<: *basic-pgms-zafl
+  tags:
+    - ubuntu18
+
+basic-pgms-zafl-ubuntu16:
+  <<: *basic-pgms-zafl
+  tags:
+    - ubuntu16
+
+basic-pgms-zafl-centos76:
+  <<: *basic-pgms-zafl
+  tags:
+    - centos76
 
 #
 # test zafl with afl
 #
-#.afl-zafl: &afl-zafl
-#  stage: test
-#  script:
-#    - ./cicd_testing/afl-zafl.sh
-#
-#afl-zafl-ubuntu18:
-#  <<: *afl-zafl
-#  tags:
-#    - ubuntu18
-
-#afl-zafl-ubuntu16:
-#  <<: *afl-zafl
-#  tags:
-#    - ubuntu16
-#
-#afl-zafl-centos76:
-#  <<: *afl-zafl
-#  tags:
-#    - centos76
+.afl-zafl: &afl-zafl
+  stage: test
+  script:
+    - ./cicd_testing/afl-zafl.sh
+
+afl-zafl-ubuntu18:
+  <<: *afl-zafl
+  tags:
+    - ubuntu18
+
+afl-zafl-ubuntu16:
+  <<: *afl-zafl
+  tags:
+    - ubuntu16
 
+afl-zafl-centos76:
+  <<: *afl-zafl
+  tags:
+    - centos76
 
 #
 # Deploy a docker image to gitlab.
diff --git a/cicd_testing/afl-zafl.sh b/cicd_testing/afl-zafl.sh
index b93fb1bd336bb18d92e54cacf3854da03e2551f9..ffced6f5be0d802f1c8b60628d6de962d87754c8 100755
--- a/cicd_testing/afl-zafl.sh
+++ b/cicd_testing/afl-zafl.sh
@@ -13,11 +13,8 @@ sudo $ZAFL_HOME/util/afl_setup_core_pattern.sh
 
 echo "Test various zafl configurations"
 $ZAFL_HOME/test/strings/test_strings.sh
-
-exit 0
-
-$ZAFL_HOME//test/bc/test_bc.sh
-$ZAFL_HOME//test/od/test_od.sh
+$ZAFL_HOME/test/bc/test_bc.sh
+$ZAFL_HOME/test/od/test_od.sh
 
 echo "Test graph optimizations"
 $ZAFL_HOME/tools/zax/test/test_graph.sh
diff --git a/cicd_testing/basic-pgms-zafl.sh b/cicd_testing/basic-pgms-zafl.sh
index 44e94cd58d6dbd47eaa3d6ef2dae98bfed19626f..b6107ee5537dd22ffe0a53a133051d06f414b69f 100755
--- a/cicd_testing/basic-pgms-zafl.sh
+++ b/cicd_testing/basic-pgms-zafl.sh
@@ -16,10 +16,8 @@ main()
 		benchmarks="tcpdump ncal bzip2 tar"
 		configs="zafl_nostars zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
 	else
-#		benchmarks="readelf touch"
-#		configs="zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
-		benchmarks="touch"
-		configs="zafl_context_sensitive_laf_domgraph_optgraph"
+		benchmarks="readelf touch"
+		configs="zafl_untracer_critical_edges zafl_context_sensitive_laf_domgraph_optgraph"
 	fi
 
 	# test other zafl configs on various apps