diff --git a/build/build-mac b/build/build-mac
index ee7e8c29d..3283850f2 100755
--- a/build/build-mac
+++ b/build/build-mac
@@ -113,5 +113,8 @@ make -j$cores
 
 check_library_dependencies
 
+# make sure tests all pass
+ctest
+
 zip -r "$ZIPFILE" PHD2.app
 chmod 644 "$ZIPFILE"
diff --git a/build/build-win b/build/build-win
index 11e2b5ee5..00173e9ee 100755
--- a/build/build-win
+++ b/build/build-win
@@ -66,6 +66,7 @@ fi
 
 CMD="/c/Windows/System32/cmd.exe"
 CMAKE='/c/Program Files/CMake/bin/cmake.exe'
+CTEST='/c/Program Files/CMake/bin/ctest.exe'
 ISCC="/c/Program Files (x86)/Inno Setup 5/ISCC.exe"
 
 CMAKE_W=$(cygpath -w "$CMAKE")
@@ -80,24 +81,21 @@ vcpkg_args=()
 if [[ $VCPKG_ROOT ]]; then
     vcpkg_args+=(-DVCPKG_ROOT=$VCPKG_ROOT)
 fi
+
 mkdir -p tmp
-(
-    cd tmp
+cd tmp
 
-    cat >run_cmake.bat <<EOF
+cat >run_cmake.bat <<EOF
 "$CMAKE_W" -Wno-dev -G "Visual Studio 17" -A Win32 ${vcpkg_args[@]} "-DwxWidgets_PREFIX_DIRECTORY=%WXWIN%" ..
 EOF
-
-    "$CMD" /c run_cmake.bat
-)
+"$CMD" /c run_cmake.bat
 
 # generate phd2.iss and README.txt in tmp, one level up from Release/
-sed -e "s/@VERSION@/$V/g" phd2.iss.in >tmp/phd2.iss
-sed -e "s/@VERSION@/$V/g" README-PHD2.txt.in >tmp/README-PHD2.txt
+sed -e "s/@VERSION@/$V/g" ../phd2.iss.in >phd2.iss
+sed -e "s/@VERSION@/$V/g" ../README-PHD2.txt.in >README-PHD2.txt
+
+"$CMAKE" --build . --config Release
 
-(
-    cd tmp
-    "$CMAKE" --build . --target phd2 --config Release
+"$CTEST" --build-config Release
 
-    "$ISCC" phd2.iss /F"${INSTALLER}"
-)
+"$ISCC" phd2.iss /F"${INSTALLER}"
diff --git a/cmake_modules/compiler_options.cmake b/cmake_modules/compiler_options.cmake
index b8c016b2c..bb2c83b2f 100644
--- a/cmake_modules/compiler_options.cmake
+++ b/cmake_modules/compiler_options.cmake
@@ -42,9 +42,7 @@ if(WIN32)
 endif()
 
 # these options allow to use system libraries
-option(USE_SYSTEM_CFITSIO "Enable this option here or in cmake call if you want to use system's cfitsio." OFF)
 option(USE_SYSTEM_LIBUSB "Enable this option here or in cmake call if you want to use system's libUSB." OFF)
-option(USE_SYSTEM_EIGEN3 "Enable this option here or in cmake call if you want to use system's Eigen3." OFF)
 option(USE_SYSTEM_GTEST "Enable this option here or in cmake call if you want to use system's Gtest." OFF)
 option(USE_SYSTEM_LIBINDI "Enable this option here or in cmake call if you want to use system's libindi." OFF)
 
diff --git a/debian/rules b/debian/rules
index 26724fcad..e2ab91423 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,5 +28,5 @@ include /usr/share/dpkg/default.mk
 #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	dh_auto_configure --  -DUSE_SYSTEM_LIBINDI=1 -DUSE_SYSTEM_EIGEN3=1 -DUSE_SYSTEM_GTEST=1 -DUSE_SYSTEM_LIBUSB=1
+	dh_auto_configure --  -DUSE_SYSTEM_LIBINDI=1 -DUSE_SYSTEM_GTEST=1 -DUSE_SYSTEM_LIBUSB=1
 
diff --git a/thirdparty/eigen-eigen-67e894c6cd8f.tar.bz2 b/thirdparty/eigen-eigen-67e894c6cd8f.tar.bz2
deleted file mode 100644
index 5b58f6fa3..000000000
Binary files a/thirdparty/eigen-eigen-67e894c6cd8f.tar.bz2 and /dev/null differ
diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
index e91c6ca99..bd573fa75 100644
--- a/thirdparty/thirdparty.cmake
+++ b/thirdparty/thirdparty.cmake
@@ -495,21 +495,10 @@ endif()
 
 if(WIN32)
   set(EIGEN_SRC ${VCPKG_INCLUDE}/eigen3)
-elseif(USE_SYSTEM_EIGEN3)
+else()
   find_package(Eigen3 REQUIRED)
   set(EIGEN_SRC ${EIGEN3_INCLUDE_DIR})
   message(STATUS "Using system's Eigen3.")
-else(USE_SYSTEM_EIGEN3)
-  set(EIGEN eigen-eigen-67e894c6cd8f)
-  set(eigen_root ${thirdparties_deflate_directory}/${EIGEN})
-  if(NOT EXISTS ${eigen_root})
-    # untar the dependency
-    execute_process(
-      COMMAND ${CMAKE_COMMAND} -E tar xjf ${thirdparty_dir}/${EIGEN}.tar.bz2
-      WORKING_DIRECTORY ${thirdparties_deflate_directory})
-  endif()
-
-  set(EIGEN_SRC ${eigen_root})
 endif()