diff --git a/.travis.yml b/.travis.yml
index dadc10af..02b8383a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,12 @@ language: python
 python:
   - 3.6.5
 install:
+
+- wget -O llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key 
+- sudo apt-key add llvm-snapshot.gpg.key
+- sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
 - sudo apt-get -y update
-- sudo apt-get -y install build-essential gcc-multilib cmake python3-pip python3-setuptools libffi-dev python3-nose
+- sudo apt-get -y install build-essential gcc-multilib clang-6.0 cmake python3-pip python3-setuptools libffi-dev python3-nose
 - pip3 install pip
 - pip3.6 -V
 - pip3.6 install pyflakes
@@ -13,7 +17,7 @@ install:
 - pip3.6 install https://github.com/trailofbits/manticore/archive/master.zip
 - mkdir build
 - cd build
-- cmake ..
+- CC=clang-6.0 CXX=clang++-6.0 cmake ..
 - sudo make install
 - cd ..
 env:
diff --git a/tests/test_lists.py b/tests/test_lists.py
index 2c0b9db6..ef1ff428 100644
--- a/tests/test_lists.py
+++ b/tests/test_lists.py
@@ -5,8 +5,8 @@
 
 class ListsTest(deepstate_base.DeepStateTestCase):
   def run_deepstate(self, deepstate):
-    if deepstate == "deepstate-manticore":
-       return # Just skip for now, we know it's too slow
+    #if deepstate == "deepstate-manticore":
+    #   return # Just skip for now, we know it's too slow
     (r, output) = logrun.logrun([deepstate, "build/examples/Lists"],
                   "deepstate.out", 3000)
     self.assertEqual(r, 0)
diff --git a/tests/test_runlen.py b/tests/test_runlen.py
index 7a7e3e99..33d3818d 100644
--- a/tests/test_runlen.py
+++ b/tests/test_runlen.py
@@ -5,8 +5,8 @@
 
 class RunlenTest(deepstate_base.DeepStateTestCase):
   def run_deepstate(self, deepstate):
-    if deepstate == "deepstate-manticore":
-       return # Just skip for now, we know it's too slow    
+    #if deepstate == "deepstate-manticore":
+    #   return # Just skip for now, we know it's too slow    
     (r, output) = logrun.logrun([deepstate, "build/examples/Runlen"],
                   "deepstate.out", 2900)
     self.assertEqual(r, 0)