diff --git a/Makefile b/Makefile
index 2a871dc85..c6a1aae5e 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ pedantic_clang:
 
 # calling GCC with most warnings
 pedantic_gcc:
-	$(MAKE) json_unit CXX=$(COMPILER_DIR)/g++ CXXFLAGS="-D_Atomic=volatile \
+	$(MAKE) json_unit CXX=$(COMPILER_DIR)/g++ CXXFLAGS=" \
 		-std=c++11 \
 		-Waddress \
 		-Waddress-of-packed-member \
diff --git a/test/src/unit-allocator.cpp b/test/src/unit-allocator.cpp
index 6374640fc..c46afc59e 100644
--- a/test/src/unit-allocator.cpp
+++ b/test/src/unit-allocator.cpp
@@ -69,9 +69,9 @@ TEST_CASE("bad_alloc")
 
 namespace
 {
-static bool next_construct_fails = false;
-static bool next_destroy_fails = false;
-static bool next_deallocate_fails = false;
+bool next_construct_fails = false;
+bool next_destroy_fails = false;
+bool next_deallocate_fails = false;
 
 template<class T>
 struct my_allocator : std::allocator<T>