diff --git a/.travis.yml b/.travis.yml
index b4462ed0e7..19bb96040b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ script:
   - if [[ $OPENMC_CONFIG == "check_source" ]]; then
       ./check_source.py;
     else
-      ./run_tests.py -C $OPENMC_CONFIG -j 2;
+      ./run_tests.py -C $OPENMC_CONFIG -j 2 &&
       pytest --cov=../openmc unit_tests/;
     fi
   - cd ..
diff --git a/setup.py b/setup.py
index 271fac0f00..2f85bc3a3b 100755
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ kwargs = {
     # Required dependencies
     'install_requires': [
         'six', 'numpy>=1.9', 'h5py', 'scipy', 'ipython', 'matplotlib',
-        'pandas>=0.17.0', 'lxml', 'uncertainties'
+        'pandas<0.21.0', 'lxml', 'uncertainties'
     ],
 
     # Optional dependencies