diff --git a/test/unit/StringValueTest.cpp b/test/unit/StringValueTest.cpp
index b15c54b047..7a4b923248 100644
--- a/test/unit/StringValueTest.cpp
+++ b/test/unit/StringValueTest.cpp
@@ -1,14 +1,7 @@
-#include "Value.h"
-
-#include "gtest/gtest.h"
+#include "StringValueTest.h"
 
 namespace ntimpl {
 
-class StringValueTest : public ::testing::Test {
- public:
-  NT_String& ToNT(StringValue& v) { return v; }
-};
-
 TEST_F(StringValueTest, ConstructEmpty) {
   StringValue v;
   ASSERT_EQ(nullptr, ToNT(v).str);
diff --git a/test/unit/StringValueTest.h b/test/unit/StringValueTest.h
new file mode 100644
index 0000000000..2943353315
--- /dev/null
+++ b/test/unit/StringValueTest.h
@@ -0,0 +1,12 @@
+#include "Value.h"
+
+#include "gtest/gtest.h"
+
+namespace ntimpl {
+
+class StringValueTest : public ::testing::Test {
+ public:
+  NT_String& ToNT(StringValue& v) { return v; }
+};
+
+}  // namespace ntimpl
diff --git a/test/unit/ValueTest.cpp b/test/unit/ValueTest.cpp
index 4f14ea9c25..7a7f3b912b 100644
--- a/test/unit/ValueTest.cpp
+++ b/test/unit/ValueTest.cpp
@@ -1,14 +1,7 @@
-#include "Value.h"
-
-#include "gtest/gtest.h"
+#include "ValueTest.h"
 
 namespace ntimpl {
 
-class ValueTest : public ::testing::Test {
- public:
-  NT_Value& ToNT(Value& v) { return v; }
-};
-
 typedef ValueTest ValueDeathTest;
 
 TEST_F(ValueTest, ConstructEmpty) {
diff --git a/test/unit/ValueTest.h b/test/unit/ValueTest.h
new file mode 100644
index 0000000000..abe49a28a4
--- /dev/null
+++ b/test/unit/ValueTest.h
@@ -0,0 +1,12 @@
+#include "Value.h"
+
+#include "gtest/gtest.h"
+
+namespace ntimpl {
+
+class ValueTest : public ::testing::Test {
+ public:
+  NT_Value& ToNT(Value& v) { return v; }
+};
+
+}  // namespace ntimpl