diff --git a/GildedRose/cpp/GildedRose.h b/GildedRose/cpp/GildedRose.h
index c3ebb814..0cb1bbf9 100644
--- a/GildedRose/cpp/GildedRose.h
+++ b/GildedRose/cpp/GildedRose.h
@@ -1,5 +1,3 @@
-#include <gtest/gtest.h>
-
 #include <string>
 
 using namespace std;
@@ -113,11 +111,3 @@ void example()
 }
 
 
-TEST(GildedRoseTest, Foo) {
-    vector<Item> items;
-    items.push_back(Item("Foo", 0, 0));
-    GildedRose app(items);
-    app.updateQuality();
-    EXPECT_EQ("fixme", app.items[0].name);
-}
-
diff --git a/GildedRose/cpp/GildedRoseUnitTests.cc b/GildedRose/cpp/GildedRoseUnitTests.cc
new file mode 100644
index 00000000..000cc6b5
--- /dev/null
+++ b/GildedRose/cpp/GildedRoseUnitTests.cc
@@ -0,0 +1,12 @@
+#include <gtest/gtest.h>
+
+#include "GildedRose.h"
+
+TEST(GildedRoseTest, Foo) {
+    vector<Item> items;
+    items.push_back(Item("Foo", 0, 0));
+    GildedRose app(items);
+    app.updateQuality();
+    EXPECT_EQ("fixme", app.items[0].name);
+}
+
diff --git a/GildedRose/cpp/Makefile b/GildedRose/cpp/Makefile
index 460e959d..56b3f6c3 100644
--- a/GildedRose/cpp/Makefile
+++ b/GildedRose/cpp/Makefile
@@ -71,5 +71,5 @@ gtest_main.a : gtest-all.o gtest_main.o
 #  $(GTEST_HEADERS)
 #	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.h
 
-GildedRose : GildedRose.h gtest_main.a
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(USER_DIR)/GildedRose.h -pthread $^ -o $@
+GildedRose : GildedRoseUnitTests.cc gtest_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@