diff --git a/lib/cpp/src/test/StressTest.thrift b/test/StressTest.thrift
similarity index 100%
rename from lib/cpp/src/test/StressTest.thrift
rename to test/StressTest.thrift
diff --git a/lib/cpp/src/test/Makefile b/test/cpp/Makefile.stress
similarity index 82%
rename from lib/cpp/src/test/Makefile
rename to test/cpp/Makefile.stress
index 9b15095..2190cc3 100644
--- a/lib/cpp/src/test/Makefile
+++ b/test/cpp/Makefile.stress
@@ -38,13 +38,13 @@
 debug: stress-test-debug
 
 stubs: StressTest.thrift
-	$(THRIFT) --cpp --php StressTest.thrift
+	$(THRIFT) --cpp --php ../StressTest.thrift
 
 stress-test-debug: stubs
-	g++ -o stress-test $(DCFL) main.cc cpp-gen/StressTest.cc
+	g++ -o stress-test $(DCFL) src/main.cc cpp-gen/StressTest.cc
 
 stress-test: stubs
-	g++ -o stress-test $(CFL) main.cc cpp-gen/StressTest.cc
+	g++ -o stress-test $(CFL) src/main.cc cpp-gen/StressTest.cc
 
 clean:
 	rm -fr stress-test cpp-gen
diff --git a/test/cpp/Makefile b/test/cpp/Makefile.thrift
similarity index 100%
rename from test/cpp/Makefile
rename to test/cpp/Makefile.thrift
diff --git a/lib/cpp/src/test/main.cc b/test/cpp/src/main.cc
similarity index 100%
rename from lib/cpp/src/test/main.cc
rename to test/cpp/src/main.cc