diff --git a/Test/TestBullet3OpenCL/main.cpp b/Test/TestBullet3OpenCL/main.cpp
new file mode 100644
index 000000000..c5ca8ccb9
--- /dev/null
+++ b/Test/TestBullet3OpenCL/main.cpp
@@ -0,0 +1,37 @@
+
+#include <gtest/gtest.h>
+
+#include "Bullet3Common/b3Logging.h"
+
+void myerrorwarningprintf(const char* msg)
+{
+	//OutputDebugStringA(msg);
+	printf(msg);
+}
+
+void myprintf(const char* msg)
+{
+	//OutputDebugStringA(msg);
+	//printf(msg);
+}
+
+int gArgc=0;
+char** gArgv=0;
+
+
+int main(int argc, char **argv) {
+#if _MSC_VER
+        _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
+        //void *testWhetherMemoryLeakDetectionWorks = malloc(1);
+#endif
+        ::testing::InitGoogleTest(&argc, argv);
+
+		gArgc = argc;
+		gArgv = argv;
+
+		b3SetCustomPrintfFunc(myprintf);
+		b3SetCustomWarningMessageFunc(myerrorwarningprintf);
+		b3SetCustomErrorMessageFunc(myerrorwarningprintf);
+
+        return RUN_ALL_TESTS();
+}
diff --git a/Test/TestBullet3OpenCL/premake4.lua b/Test/TestBullet3OpenCL/premake4.lua
new file mode 100644
index 000000000..0b5a622f1
--- /dev/null
+++ b/Test/TestBullet3OpenCL/premake4.lua
@@ -0,0 +1,46 @@
+function createProject(vendor)
+
+	project "Test_OpenCL_Bullet3"
+		
+	kind "ConsoleApp"
+	
+--	defines {  }
+	
+	targetdir "../../bin"
+	
+	initOpenCL(vendor)
+	
+	includedirs 
+	{
+		".","../gtest-1.7.0/include",
+		"../../src",
+	}
+
+	links {"gtest",
+--			"Bullet2FileLoader",
+			 "Bullet3OpenCL_" .. vendor,
+--			"Bullet3Dynamics",
+--			"Bullet3Collision",
+--			"Bullet3Geometry",
+			"Bullet3Common"
+	}
+			
+	
+	files {
+		"**.cpp",
+		"**.h",
+		"../OpenCL/BasicInitialize/testInitOpenCL.cpp",
+		"../OpenCL/AllBullet3Kernels/*.cpp"
+		
+	}
+	if os.is("Windows") then
+	end
+
+	if os.is("Linux") then 
+	end
+
+	if os.is("MacOSX") then
+	end
+end
+
+createProject("clew")
\ No newline at end of file