diff --git a/CMakeLists.txt b/CMakeLists.txt
index b37287a7..b7e9ae7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,9 +318,11 @@ include_directories ("${CMAKE_SOURCE_DIR}/src"
# System-Specific Settings
##############################
-# If building on Travis, set a preprocessor definition.
+# If building on Travis, define BOOST_NO_CXX11_SCOPED_ENUMS to avoid
+# boost::filesystem::copy_file() linking errors due to mismatched C++ runtimes
+# between Boost and LOOT.
IF ($ENV{TRAVIS})
- add_definitions (-DTRAVIS)
+ add_definitions (-DBOOST_NO_CXX11_SCOPED_ENUMS)
ENDIF ()
# Settings when compiling for Windows.
diff --git a/src/tests/api/main.cpp b/src/tests/api/main.cpp
index 517c32a5..b6580a0c 100644
--- a/src/tests/api/main.cpp
+++ b/src/tests/api/main.cpp
@@ -22,11 +22,6 @@
.
*/
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
#include
#include "loot_apply_load_order_test.h"
diff --git a/src/tests/backend/main.cpp b/src/tests/backend/main.cpp
index 90593c5e..8925843b 100644
--- a/src/tests/backend/main.cpp
+++ b/src/tests/backend/main.cpp
@@ -22,11 +22,6 @@
.
*/
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
#include "tests/api/loot_db_test.h"
#include "app/loot_paths_test.h"
diff --git a/src/validator/main.cpp b/src/validator/main.cpp
index b1df79d4..08d02363 100644
--- a/src/validator/main.cpp
+++ b/src/validator/main.cpp
@@ -22,11 +22,6 @@
.
*/
-#ifdef TRAVIS
-#pragma message("This is a Travis build, so defining BOOST_NO_CXX11_SCOPED_ENUMS to avoid boost::filesystem::copy_file() linking errors.")
-#define BOOST_NO_CXX11_SCOPED_ENUMS
-#endif
-
#include "backend/app/loot_version.h"
#include "backend/metadata_list.h"