diff --git a/Builds/VisualStudio2012/BeastConfig.h b/Builds/VisualStudio2012/BeastConfig.h
index 0a19d0402d..ebf0d9a7bd 100644
--- a/Builds/VisualStudio2012/BeastConfig.h
+++ b/Builds/VisualStudio2012/BeastConfig.h
@@ -120,4 +120,6 @@
//#define BEAST_BIND_USES_TR1 1
//#define BEAST_BIND_USES_BOOST 1
+#define BEAST_UNIT_TESTS 1
+
#endif
diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index cfe90104b5..003059c69e 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -116,6 +116,7 @@
+
@@ -210,7 +211,6 @@
-
@@ -382,6 +382,12 @@
true
true
+
+ true
+ true
+ true
+ true
+
true
true
@@ -790,12 +796,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index 20c4448428..2b21ca3516 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -77,9 +77,6 @@
{d3ea4af5-ae48-4144-a2ef-a212342d72ee}
-
- {0a8a6870-87a4-4f19-bbd3-b277f94bb83e}
-
{a1a38659-7779-41d6-8a3c-068433c4deaf}
@@ -406,9 +403,6 @@
beast_core\time
-
- beast_core\unit_tests
-
beast_core\xml
@@ -608,6 +602,9 @@
beast_core\memory
+
+ beast_core\diagnostic
+
@@ -808,9 +805,6 @@
beast_core\time
-
- beast_core\unit_tests
-
beast_core\xml
@@ -946,6 +940,9 @@
beast_basics\events
+
+ beast_core\diagnostic
+
diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.cpp
index 15bb00a58c..82966a182e 100644
--- a/modules/beast_core/beast_core.cpp
+++ b/modules/beast_core/beast_core.cpp
@@ -148,6 +148,7 @@ namespace beast
#include "diagnostic/beast_Error.cpp"
#include "diagnostic/beast_FPUFlags.cpp"
#include "diagnostic/beast_LeakChecked.cpp"
+#include "diagnostic/beast_UnitTest.cpp"
#include "files/beast_DirectoryIterator.cpp"
#include "files/beast_File.cpp"
@@ -208,8 +209,6 @@ namespace beast
#include "time/beast_RelativeTime.cpp"
#include "time/beast_Time.cpp"
-#include "unit_tests/beast_UnitTest.cpp"
-
#include "xml/beast_XmlDocument.cpp"
#include "xml/beast_XmlElement.cpp"
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index 2977bb636a..093cd41fcb 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -214,6 +214,7 @@ namespace beast
#include "diagnostic/beast_SafeBool.h"
#include "diagnostic/beast_Error.h"
#include "diagnostic/beast_FPUFlags.h"
+#include "diagnostic/beast_UnitTest.h"
#include "diagnostic/beast_Throw.h"
#include "containers/beast_AbstractFifo.h"
#include "containers/beast_Array.h"
@@ -313,7 +314,6 @@ namespace beast
#include "time/beast_PerformanceCounter.h"
#include "time/beast_RelativeTime.h"
#include "time/beast_Time.h"
-#include "unit_tests/beast_UnitTest.h"
#include "xml/beast_XmlDocument.h"
#include "xml/beast_XmlElement.h"
#include "zip/beast_GZIPCompressorOutputStream.h"
diff --git a/modules/beast_core/unit_tests/beast_UnitTest.cpp b/modules/beast_core/diagnostic/beast_UnitTest.cpp
similarity index 100%
rename from modules/beast_core/unit_tests/beast_UnitTest.cpp
rename to modules/beast_core/diagnostic/beast_UnitTest.cpp
diff --git a/modules/beast_core/unit_tests/beast_UnitTest.h b/modules/beast_core/diagnostic/beast_UnitTest.h
similarity index 100%
rename from modules/beast_core/unit_tests/beast_UnitTest.h
rename to modules/beast_core/diagnostic/beast_UnitTest.h