diff --git a/base_cpp/test/atomic_test.cc b/base_cpp/test/atomic_test.cc
index 156dca4..6ce9e25 100644
--- a/base_cpp/test/atomic_test.cc
+++ b/base_cpp/test/atomic_test.cc
@@ -346,8 +346,6 @@ void AtomicTest::BasicTests() {
   //Boolean operations...
   // And
   i = 0;
-  i &= 0;
-  PT_EXPECT(i == 0);
   i &= 1;
   PT_EXPECT(i == 0);
   i = 1;
diff --git a/base_cpp/test/mutex_test.cc b/base_cpp/test/mutex_test.cc
index 879ff6a..5b3be62 100644
--- a/base_cpp/test/mutex_test.cc
+++ b/base_cpp/test/mutex_test.cc
@@ -93,10 +93,10 @@ void MutexTest::PostLockGuardCount() {
 }
 
 void MutexTest::TestUniqueLock() {
+  { // Test standard usage and releasing
 #ifdef EMBB_USE_EXCEPTIONS
-  bool exception_thrown = false;
+    bool exception_thrown = false;
 #endif
-  { // Test standard usage and releasing
     UniqueLock<Mutex> lock(mutex_);
     PT_EXPECT_EQ(lock.OwnsLock(), true);