diff --git a/.travis.yml b/.travis.yml
index 91298410..e23c7604 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,14 +22,16 @@ install:
   - conda update -q conda
   # Useful for debugging any issues with conda
   - conda info -a
-  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11 swig cmake gxx_linux-64
+  - conda create -q -n test-environment 
   - source activate test-environment
-  - echo "eigen 3.2.*" > $CONDA_PREFIX/conda-meta/pinned
-  - conda install eigen
+  - conda config --env --add channels conda-forge
+  - conda install python=$TRAVIS_PYTHON_VERSION boost fftw numpy pybind11=2.2.* swig cmake compilers eigen=3.2.*
   - export BOOST_DIR=$CONDA_PREFIX
   - export EIGEN_DIR=$CONDA_PREFIX
   - export FFTW_DIR=$CONDA_PREFIX
   - export CMAKE_PREFIX_PATH=$CONDA_PREFIX
+  # For conda-forge's old glibc
+  - export LDFLAGS="-lrt ${LDFLAGS}"
 
 script:
   - mkdir build
diff --git a/tests/ndarray-eigen.cc b/tests/ndarray-eigen.cc
index 475c7a63..2b6511b0 100644
--- a/tests/ndarray-eigen.cc
+++ b/tests/ndarray-eigen.cc
@@ -12,9 +12,8 @@
 #include "ndarray/buildOptions.h"
 #include "Eigen/SVD"
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ndarray-eigen
-#include "boost/test/unit_test.hpp"
+#include "boost/test/included/unit_test.hpp"
 
 template <typename T, typename U>
 void testElements2(T const & a, U const & b) {
diff --git a/tests/ndarray-fft.cc b/tests/ndarray-fft.cc
index 151f6dcc..beb0aa13 100644
--- a/tests/ndarray-fft.cc
+++ b/tests/ndarray-fft.cc
@@ -10,9 +10,8 @@
  */
 #include <ndarray/fft.h>
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ndarray-fft
-#include "boost/test/unit_test.hpp"
+#include "boost/test/included/unit_test.hpp"
 
 #include <sstream>
 
diff --git a/tests/ndarray.cc b/tests/ndarray.cc
index 7729e4ad..5f0311b5 100644
--- a/tests/ndarray.cc
+++ b/tests/ndarray.cc
@@ -10,9 +10,8 @@
  */
 #include "ndarray.h"
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE ndarray
-#include "boost/test/unit_test.hpp"
+#include "boost/test/included/unit_test.hpp"
 
 BOOST_AUTO_TEST_CASE(sizes) {
     std::cerr << "sizeof(int): " << sizeof(int) << "\n";
diff --git a/tests/views.cc b/tests/views.cc
index 70dfd1c2..11621a4c 100644
--- a/tests/views.cc
+++ b/tests/views.cc
@@ -10,9 +10,8 @@
  */
 #include "ndarray.h"
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE views
-#include "boost/test/unit_test.hpp"
+#include "boost/test/included/unit_test.hpp"
 
 template <typename T, int N, int C>
 int templateC(ndarray::ArrayRef<T,N,C> const &) { return C; }