12 files changed, 19 insertions, 11 deletions
diff --git a/src/mongo/db/pipeline/field_path_test.cpp b/src/mongo/db/pipeline/field_path_test.cpp
index 6886e0116a7..b81b99e7ef6 100644
--- a/src/mongo/db/pipeline/field_path_test.cpp
+++ b/src/mongo/db/pipeline/field_path_test.cpp
@@ -34,6 +34,9 @@
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
+
+namespace {
+
 using std::string;
 using std::vector;
 
@@ -199,4 +202,6 @@ public:
     }
 };
 SuiteInstance<All> myall;
+
+}  // namespace
 }  // namespace mongo
diff --git a/src/mongo/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp
index 9734c1d8aab..f0f68d05c97 100644
--- a/src/mongo/dbtests/basictests.cpp
+++ b/src/mongo/dbtests/basictests.cpp
@@ -215,7 +215,7 @@ public:
         ASSERT_EQUALS("999", sb.str());
     }
 };
-}
+}  // namespace stringbuildertests
 
 class sleeptest {
 public:
diff --git a/src/mongo/dbtests/dbhelper_tests.cpp b/src/mongo/dbtests/dbhelper_tests.cpp
index 1ed948092c7..fd0835ea4a2 100644
--- a/src/mongo/dbtests/dbhelper_tests.cpp
+++ b/src/mongo/dbtests/dbhelper_tests.cpp
@@ -42,6 +42,8 @@
 
 namespace mongo {
 
+namespace {
+
 using std::unique_ptr;
 using std::set;
 
@@ -115,4 +117,5 @@ public:
     }
 } myall;
 
-}  // namespace RemoveTests
+}  // namespace
+}  // namespace mongo
diff --git a/src/mongo/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp
index 8e7c4a0a1e8..8412ba0c1e4 100644
--- a/src/mongo/dbtests/directclienttests.cpp
+++ b/src/mongo/dbtests/directclienttests.cpp
@@ -210,4 +210,4 @@ public:
 };
 
 SuiteInstance<All> myall;
-}
+}  // namespace DirectClientTests
diff --git a/src/mongo/dbtests/gle_test.cpp b/src/mongo/dbtests/gle_test.cpp
index 026933c3d22..75233fb048d 100644
--- a/src/mongo/dbtests/gle_test.cpp
+++ b/src/mongo/dbtests/gle_test.cpp
@@ -124,4 +124,4 @@ public:
 };
 
 SuiteInstance<All> myall;
-}
+}  // namespace
diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index 2334cadd512..4b5943cdc8f 100644
--- a/src/mongo/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
@@ -162,7 +162,7 @@ FieldCompareResult compareDottedFieldNames(const string& l, const string& r, con
     verify(0);
     return SAME;  // will never get here
 }
-}
+}  // namespace mongo
 
 namespace JsobjTests {
 
diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index c2b05e9a352..fe5c44fff0f 100644
--- a/src/mongo/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
@@ -2513,4 +2513,4 @@ public:
 
 SuiteInstance<All> myall;
 
-}  // namespace JavaJSTests
+}  // namespace JSTests
diff --git a/src/mongo/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp
index 603f968355e..73e6fc20f83 100644
--- a/src/mongo/dbtests/mmaptests.cpp
+++ b/src/mongo/dbtests/mmaptests.cpp
@@ -298,4 +298,4 @@ SuiteInstance<All> myall;
     } myall;
 
 #endif
-}
+}  // namespace MMapTests
diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index 6c4ac4751e3..8c761037950 100644
--- a/src/mongo/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
@@ -465,4 +465,4 @@ public:
         add<stdtimed_mutexspeed>();
     }
 } myall;
-}
+}  // namespace PerfTests
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index cd2f902372a..8170aa4735e 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -1715,7 +1715,7 @@ public:
         ASSERT_BSONOBJ_EQ(BSON("x" << 1), QUERY("$query" << BSON("x" << 1)).getFilter());
     }
 };
-}
+}  // namespace queryobjecttests
 
 class OrderingTest {
 public:
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index 6df44bf138c..956a872447a 100644
--- a/src/mongo/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
@@ -583,4 +583,4 @@ public:
 };
 
 SuiteInstance<All> myall;
-}
+}  // namespace ThreadedTests
diff --git a/src/mongo/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp
index 494c590f1d5..92bd635d0af 100644
--- a/src/mongo/dbtests/updatetests.cpp
+++ b/src/mongo/dbtests/updatetests.cpp
@@ -1998,7 +1998,7 @@ class setswitchint : public Base {
              BSON("_id" << 1 << "x" << 1));
     }
 };
-};
+}  // namespace basic
 
 
 class All : public Suite {