3 files changed, 9 insertions, 9 deletions

diff --git a/other/travis/env-linux.sh b/other/travis/env-linux.sh
index 10b4fe82..dd5a6f7f 100644
--- a/other/travis/env-linux.sh
+++ b/other/travis/env-linux.sh
@@ -4,6 +4,7 @@ CMAKE=cmake
 CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON"
 NPROC=`nproc`
 CURDIR=$PWD
+RUN_TESTS=true
 
 RUN() {
   "$@"
diff --git a/other/travis/env-windows.sh b/other/travis/env-windows.sh
index 0ea1f726..7ae6ea25 100644
--- a/other/travis/env-windows.sh
+++ b/other/travis/env-windows.sh
@@ -4,13 +4,12 @@ CMAKE=$ARCH-w64-mingw32.shared-cmake
 CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
 NPROC=`nproc`
 CURDIR=/work
+RUN_TESTS=false
 
 RUN() {
   ./dockcross "$@"
 }
 
-ENABLE_WINDOWS_TESTS=false
-
 TESTS() {
   # Download Microsoft DLLs.
   curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll
@@ -20,10 +19,8 @@ TESTS() {
   ./dockcross sh -c 'cp $WINEDLLPATH/*.dll _build'
 
   # Run tests in docker.
-  if $ENABLE_WINDOWS_TESTS; then
-    ./dockcross "$@" || {
-      cat _build/Testing/Temporary/LastTest.log
-      false
-    }
-  fi
+  ./dockcross "$@" || {
+    cat _build/Testing/Temporary/LastTest.log
+    false
+  }
 }
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 9b81b863..c6c0dd41 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -37,4 +37,6 @@ RUN $CMAKE                                      \
 export CTEST_OUTPUT_ON_FAILURE=1
 
 RUN make -C$BUILD_DIR -j$NPROC -k install
-TESTS make -C$BUILD_DIR -j$NPROC test
+if $RUN_TESTS; then
+  TESTS make -C$BUILD_DIR -j$NPROC test
+fi