diff --git a/BeastConfig.h b/BeastConfig.h
index 47adbde46b..4c35072c81 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -120,6 +120,4 @@
 //#define BEAST_BIND_USES_TR1   1
 //#define BEAST_BIND_USES_BOOST 1
 
-//#define BEAST_UNIT_TESTS 1
-
 #endif
diff --git a/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h b/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h
index ebf0d9a7bd..0a19d0402d 100644
--- a/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h
+++ b/Subtrees/beast/Builds/VisualStudio2012/BeastConfig.h
@@ -120,6 +120,4 @@
 //#define BEAST_BIND_USES_TR1   1
 //#define BEAST_BIND_USES_BOOST 1
 
-#define BEAST_UNIT_TESTS 1
-
 #endif
diff --git a/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.cpp b/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.cpp
index 0e3dd1236d..004a8b94e2 100644
--- a/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.cpp
+++ b/Subtrees/beast/modules/beast_core/containers/beast_AbstractFifo.cpp
@@ -224,6 +224,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static AbstractFifoTests abstractFifoTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp
index 6cc4ebfae5..056d5fb248 100644
--- a/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp
+++ b/Subtrees/beast/modules/beast_core/diagnostic/beast_UnitTest.cpp
@@ -182,9 +182,9 @@ void UnitTests::beginNewTest (UnitTest* const test, const String& subCategory)
     r->passes = 0;
     r->failures = 0;
 
-    logMessage ("Test: " + r->unitTestName + "/" + subCategory + "...");
+    logMessage ("Test '" + r->unitTestName + "': " + subCategory);
 
-    resultsUpdated();
+    resultsUpdated ();
 }
 
 void UnitTests::endTest()
@@ -241,8 +241,8 @@ void UnitTests::addFail (const String& failureMessage)
 
         r->failures++;
 
-        String message ("!!! Test ");
-        message << (r->failures + r->passes) << " failed";
+        String message ("Failure, #");
+        message << (r->failures + r->passes);
 
         if (failureMessage.isNotEmpty())
             message << ": " << failureMessage;
diff --git a/Subtrees/beast/modules/beast_core/files/beast_File.cpp b/Subtrees/beast/modules/beast_core/files/beast_File.cpp
index 7ef709e324..f3a4f8713a 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_File.cpp
+++ b/Subtrees/beast/modules/beast_core/files/beast_File.cpp
@@ -1106,7 +1106,5 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static FileTests fileTests;
-#endif
 
diff --git a/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.cpp b/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.cpp
index e9588a7382..ee6df2b5a1 100644
--- a/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.cpp
+++ b/Subtrees/beast/modules/beast_core/files/beast_RandomAccessFile.cpp
@@ -199,16 +199,18 @@ public:
         HeapBlock <char> data;
     };
 
-
     void runTest ()
     {
+        RandomAccessFile file;
+
+        beginTest ("open");
+
         Result result = file.open (File::createTempFile ("tests"), RandomAccessFile::readWrite);
 
         expect (result.wasOk (), "Should be ok");
     }
 
 private:
-    RandomAccessFile file;
 };
 
 static RandomAccessFileTests randomAccessFileTests;
diff --git a/Subtrees/beast/modules/beast_core/json/beast_JSON.cpp b/Subtrees/beast/modules/beast_core/json/beast_JSON.cpp
index d712896a1f..518c5d45a8 100644
--- a/Subtrees/beast/modules/beast_core/json/beast_JSON.cpp
+++ b/Subtrees/beast/modules/beast_core/json/beast_JSON.cpp
@@ -639,6 +639,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static JSONTests jsonTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/maths/beast_Random.cpp b/Subtrees/beast/modules/beast_core/maths/beast_Random.cpp
index ce3199699c..90628f605e 100644
--- a/Subtrees/beast/modules/beast_core/maths/beast_Random.cpp
+++ b/Subtrees/beast/modules/beast_core/maths/beast_Random.cpp
@@ -165,6 +165,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static RandomTests randomTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/streams/beast_MemoryInputStream.cpp b/Subtrees/beast/modules/beast_core/streams/beast_MemoryInputStream.cpp
index 59c6078562..eef9e80fd0 100644
--- a/Subtrees/beast/modules/beast_core/streams/beast_MemoryInputStream.cpp
+++ b/Subtrees/beast/modules/beast_core/streams/beast_MemoryInputStream.cpp
@@ -148,6 +148,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static MemoryStreamTests memoryStreamTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/text/beast_String.cpp b/Subtrees/beast/modules/beast_core/text/beast_String.cpp
index d8771bb31f..dff203b2eb 100644
--- a/Subtrees/beast/modules/beast_core/text/beast_String.cpp
+++ b/Subtrees/beast/modules/beast_core/text/beast_String.cpp
@@ -2402,6 +2402,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static StringTests stringTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/text/beast_TextDiff.cpp b/Subtrees/beast/modules/beast_core/text/beast_TextDiff.cpp
index 7a1f2a894c..8589683327 100644
--- a/Subtrees/beast/modules/beast_core/text/beast_TextDiff.cpp
+++ b/Subtrees/beast/modules/beast_core/text/beast_TextDiff.cpp
@@ -229,6 +229,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static DiffTests diffTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.cpp b/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.cpp
index 4e809a7197..da7a9accd9 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.cpp
+++ b/Subtrees/beast/modules/beast_core/threads/beast_ChildProcess.cpp
@@ -82,6 +82,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static ChildProcessTests childProcessTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp b/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp
index 999f35d444..1ffb1b9c6e 100644
--- a/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp
+++ b/Subtrees/beast/modules/beast_core/threads/beast_Thread.cpp
@@ -350,6 +350,4 @@ public:
     };
 };
 
-#if BEAST_UNIT_TESTS
 static AtomicTests atomicTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp b/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
index d8febfa5ad..da68fe9941 100644
--- a/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
+++ b/Subtrees/beast/modules/beast_core/zip/beast_GZIPCompressorOutputStream.cpp
@@ -205,6 +205,4 @@ public:
     }
 };
 
-#if BEAST_UNIT_TESTS
 static GZIPTests gzipTests;
-#endif
diff --git a/Subtrees/beast/modules/beast_crypto/math/beast_UnsignedInteger.cpp b/Subtrees/beast/modules/beast_crypto/math/beast_UnsignedInteger.cpp
index 916e6bad0d..a0532d38fa 100644
--- a/Subtrees/beast/modules/beast_crypto/math/beast_UnsignedInteger.cpp
+++ b/Subtrees/beast/modules/beast_crypto/math/beast_UnsignedInteger.cpp
@@ -29,7 +29,7 @@ public:
     {
         String s;
 
-        s << "UnsignedInteger <" << String(Bytes) << ">";
+        s << "Bytes=" << String(Bytes);
 
         beginTest (s);
 
@@ -82,6 +82,4 @@ public:
 private:
 };
 
-#if BEAST_UNIT_TESTS
 static UnsignedIntegerTests unsignedIntegerTests;
-#endif
diff --git a/modules/ripple_app/node/ripple_KeyvaDB.cpp b/modules/ripple_app/node/ripple_KeyvaDB.cpp
index 9b8672b147..c4cefb89bb 100644
--- a/modules/ripple_app/node/ripple_KeyvaDB.cpp
+++ b/modules/ripple_app/node/ripple_KeyvaDB.cpp
@@ -619,7 +619,7 @@ public:
         typedef UnsignedInteger <KeyBytes> KeyType;
     
         String s;
-        s << "keyBytes=" << String (KeyBytes);
+        s << "keyBytes=" << String (KeyBytes) << ", maxItems=" << String (maxItems);
         beginTest (s);
 
         // Set up the key and value files and open the db.
diff --git a/src/cpp/ripple/ripple_Main.cpp b/src/cpp/ripple/ripple_Main.cpp
index 2384ca4126..658d2147bc 100644
--- a/src/cpp/ripple/ripple_Main.cpp
+++ b/src/cpp/ripple/ripple_Main.cpp
@@ -141,14 +141,21 @@ public:
 
 /** Run the Beast unit tests.
 */
-static void runBeastUnitTests ()
+static void runBeastUnitTests (std::string const& individualTest = "")
 {
     RippleUnitTests tr;
 
     tr.setAssertOnFailure (false);
     tr.setPassesAreLogged (false);
 
-    tr.runAllTests ();
+    if (individualTest.empty ())
+    {
+        tr.runAllTests ();
+    }
+    else
+    {
+        tr.runTest (individualTest.c_str ());
+    }
 
     // Report
     for (int i = 0; i < tr.getNumResults (); ++i)
@@ -232,7 +239,7 @@ int rippleMain (int argc, char** argv)
     ("standalone,a", "Run with no peers.")
     ("testnet,t", "Run in test net mode.")
     ("unittest,u", "Perform unit tests.")
-    ("unittest2", "Perform new unit tests.")
+    ("unittest2", po::value <std::string> ()->implicit_value (""), "Perform new unit tests.")
     ("parameters", po::value< vector<string> > (), "Specify comma separated parameters.")
     ("quiet,q", "Reduce diagnotics.")
     ("verbose,v", "Verbose logging.")
@@ -332,7 +339,10 @@ int rippleMain (int argc, char** argv)
 
     if (vm.count ("unittest2"))
     {
-        runBeastUnitTests ();
+        std::string const test = vm ["unittest2"].as <std::string> ();
+
+        runBeastUnitTests (test);
+
         return 0;
     }