diff --git a/.travis.yml b/.travis.yml
index bceba81b8..6f8eb928e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,14 +156,14 @@ install:
           ln -s /usr/bin/aarch64-linux-gnu-ld $HOME/linker_bin/ld ;
           echo "SETTING GNU LINKER DIR" ;
           ls -al $HOME/linker_bin/ld ;
-          cmake . -DBUILD_TESTS=ON -DCROSS_COMPILE_ARM=ON -DDOWNLOAD_GTEST=ON -DARM_ARCH_DIRECTORY="$ARM_ARCH_DIR" -DARM_GCC_VER="$GCC_VER" -DTARGET_ARCH="$ARM_SETTINGS --prefix=$HOME/linker_bin/" ;
+          cmake . -DDOWNLOAD_GTEST=ON -DCROSS_COMPILE_ARM=ON -DDOWNLOAD_GTEST=ON -DARM_ARCH_DIRECTORY="$ARM_ARCH_DIR" -DARM_GCC_VER="$GCC_VER" -DTARGET_ARCH="$ARM_SETTINGS --prefix=$HOME/linker_bin/" ;
         else
-          cmake . -DBUILD_TESTS=ON -DCROSS_COMPILE_ARM=ON -DDOWNLOAD_GTEST=ON -DARM_ARCH_DIRECTORY="$ARM_ARCH_DIR" -DARM_GCC_VER="$GCC_VER" -DTARGET_ARCH="$ARM_SETTINGS" ;
+          cmake . -DDOWNLOAD_GTEST=ON -DCROSS_COMPILE_ARM=ON -DDOWNLOAD_GTEST=ON -DARM_ARCH_DIRECTORY="$ARM_ARCH_DIR" -DARM_GCC_VER="$GCC_VER" -DTARGET_ARCH="$ARM_SETTINGS" ;
         fi
       elif [[ "$ENABLE_FALLBACK" == 1 ]] ; then
-        cmake -DBUILD_TESTS=ON -DENABLE_FALLBACK=ON -DENABLE_XTL_COMPLEX=ON . ;
+        cmake -DDOWNLOAD_GTEST=ON -DENABLE_FALLBACK=ON -DENABLE_XTL_COMPLEX=ON . ;
       elif [[ "$ENABLE_XTL_COMPLEX" == 1 ]] ; then
-        cmake -DBUILD_TESTS=ON -DENABLE_XTL_COMPLEX=ON . ;
+        cmake -DDOWNLOAD_GTEST=ON -DENABLE_XTL_COMPLEX=ON . ;
       elif [[ "$AVX512" == 1 ]] ; then
         conda install gcc_linux-64 gxx_linux-64 ;
         conda install -c conda-forge beautifulsoup4==4.6.3 ;
@@ -171,9 +171,9 @@ install:
         export PATH="$HOME/miniconda/bin:$PATH" ;
         export CC=x86_64-conda_cos6-linux-gnu-gcc CXX=x86_64-conda_cos6-linux-gnu-g++ ;
         which $CXX ;
-        cmake . -DBUILD_TESTS=ON -DTARGET_ARCH=skylake-avx512 -DCMAKE_INSTALL_PREFIX=$HOME/miniconda -DDOWNLOAD_GTEST=ON ;
+        cmake . -DDOWNLOAD_GTEST=ON -DTARGET_ARCH=skylake-avx512 -DCMAKE_INSTALL_PREFIX=$HOME/miniconda -DDOWNLOAD_GTEST=ON ;
       else
-        cmake . -DBUILD_TESTS=ON ;
+        cmake . -DDOWNLOAD_GTEST=ON ;
       fi
     - make -j2 test_xsimd
     - cd test
diff --git a/include/xsimd/config/xsimd_instruction_set.hpp b/include/xsimd/config/xsimd_instruction_set.hpp
index b96335eba..ca0f1c16a 100644
--- a/include/xsimd/config/xsimd_instruction_set.hpp
+++ b/include/xsimd/config/xsimd_instruction_set.hpp
@@ -233,6 +233,11 @@
  **********************/
 
 #ifdef XSIMD_FORCE_X86_INSTR_SET
+    #undef XSIMD_X86_INSTR_SET
+    #undef XSIMD_X86_INSTR_SET_AVAILABLE
+    #undef XSIMD_INSTR_SET
+    #undef XSIMD_INSTR_SET_AVAILABLE
+
     #define XSIMD_X86_INSTR_SET XSIMD_FORCE_X86_INSTR_SET
     #define XSIMD_X86_INSTR_SET_AVAILABLE XSIMD_VERSION_NUMBER_AVAILABLE
     #define XSIMD_INSTR_SET XSIMD_X86_INSTR_SET
diff --git a/test/xsimd_algorithms.cpp b/test/xsimd_algorithms.cpp
index 037f4e874..dce14171e 100644
--- a/test/xsimd_algorithms.cpp
+++ b/test/xsimd_algorithms.cpp
@@ -168,5 +168,5 @@ TEST_F(xsimd_reduce, using_custom_binary_function)
     auto const begin = vec.begin();
     auto const end = vec.end();
 
-    EXPECT_EQ(std::accumulate(begin, end, init, multiply{}), xsimd::reduce(begin, end, init, multiply{}));
+    EXPECT_DOUBLE_EQ(std::accumulate(begin, end, init, multiply{}), xsimd::reduce(begin, end, init, multiply{}));
 }