diff --git a/test/cpp/Makefile b/test/cpp/Makefile
index 6afb30b..21c09ec 100644
--- a/test/cpp/Makefile
+++ b/test/cpp/Makefile
@@ -7,28 +7,29 @@
 target: all
 
 # Tools
-THRIFT = /usr/local/bin/thrift
+THRIFT = thrift
 CC     = g++
 LD     = g++
 
 # Compiler flags
 LIBS  = ../../lib/cpp/server/TSimpleServer.cc \
 	../../lib/cpp/protocol/TBinaryProtocol.cc \
+	../../lib/cpp/transport/TBufferedTransport.cc \
 	../../lib/cpp/transport/TServerSocket.cc \
 	../../lib/cpp/transport/TSocket.cc
-CFL   = -Wall -g -I../../lib/cpp $(LIBS)
-CFL   = -Wall -g -lthrift -I../../lib/cpp
+CFL   = -Wall -O3 -Igen-cpp -I../../lib/cpp $(LIBS)
+CFL   = -Wall -O3 -Igen-cpp -I../../lib/cpp -lthrift
 
 all: server client
 
 stubs: ../ThriftTest.thrift
-	$(THRIFT) ../ThriftTest.thrift
+	$(THRIFT) -cpp ../ThriftTest.thrift
 
 server: stubs
-	g++ -o TestServer $(CFL) TestServer.cc gen-cpp/ThriftTest.cc
+	g++ -o TestServer $(CFL) src/TestServer.cc gen-cpp/ThriftTest.cc
 
 client: stubs
-	g++ -o TestClient $(CFL) TestClient.cc gen-cpp/ThriftTest.cc
+	g++ -o TestClient $(CFL) src/TestClient.cc gen-cpp/ThriftTest.cc
 
 clean:
 	rm -fr TestServer TestClient gen-cpp