diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b748a4af70c6b1c4e2e4aa7e520c968fff09dd5c..33415b00270cb006ce313833b3d0c549920668e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,9 @@ env:ubuntu_zesty:
 config:ubuntu_zesty:
   image: keckj/hysop:ubuntu_zesty
   stage: configure
-  script: "sh ci/scripts/config.sh ./build/gcc gcc g++ gfortran"
+  script: 
+      - "sh ci/scripts/config.sh ./build/gcc-6 gcc-6 g++-6 gfortran-6"
+      - "sh ci/scripts/config.sh ./build/clang-6 clang-6.0 clang++-6.0 gfortran-6"
   dependencies:
     - env:ubuntu_zesty
   artifacts:
@@ -23,21 +25,26 @@ config:ubuntu_zesty:
 build:ubuntu_zesty:
   image: keckj/hysop:ubuntu_zesty
   stage: build
-  script: "sh ci/scripts/build.sh ./build/gcc gcc g++ gfortran"
+  script: 
+      - "sh ci/scripts/build.sh ./build/gcc-6 gcc-6 g++-6 gfortran-6"
+      - "sh ci/scripts/build.sh ./build/clang-6 clang-6.0 clang++-6.0 gfortran-6"
   dependencies:
     - config:ubuntu_zesty
   artifacts:
     paths:
         - ./build
 
-#test:ubuntu_zesty:
-  #image: keckj/hysop:ubuntu_zesty
-  #stage: test
-  #script:
-    #- useradd hysoprunner
-    #- mkdir -p "/home/hysoprunner"
-    #- chown hysoprunner:hysoprunner "/home/hysoprunner"
-    #- chmod u+rw "/home/hysoprunner"
-    #- su hysoprunner -c "sh ci/scripts/run_tests.sh"
-  #dependencies:
-    #- build:ubuntu_zesty
+test:ubuntu_zesty:
+  image: keckj/hysop:ubuntu_zesty
+  stage: test
+  script:
+    - useradd hysoprunner
+    - mkdir -p "/home/hysoprunner"
+    - chown hysoprunner:hysoprunner "/home/hysoprunner"
+    - chmod u+rw "/home/hysoprunner"
+    - su hysoprunner -c "sh ci/scripts/run_tests.sh"
+  dependencies:
+    - build:ubuntu_zesty
+  cache:
+      paths:
+        - /home/hysoprunner