diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt
index 3a3029b153..bbef7b51bf 100644
--- a/tests/cpp-tests/CMakeLists.txt
+++ b/tests/cpp-tests/CMakeLists.txt
@@ -361,23 +361,21 @@ list(APPEND GAME_HEADER
    Classes/Box2DTest/Box2dTest.h
    )
 
-if(WINDOWS)
-    list(APPEND GAME_HEADER
-        Classes/Box2DTestBed/Test.h
-        Classes/Box2DTestBed/Box2DTestBed.h
-        Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
-     )
-endif()
-
 list(APPEND GAME_SOURCE
    Classes/Box2DTest/Box2dTest.cpp
 )
 
-if(WINDOWS)
-   list(APPEND GAME_HEADER
+if(WINDOWS OR MACOSX OR LINUX)
+    list(APPEND GAME_HEADER
+        Classes/Box2DTestBed/test.h
+        Classes/Box2DTestBed/Box2DTestBed.h
+        Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
+     )
+
+   list(APPEND GAME_SOURCE
      Classes/Box2DTestBed/Box2DTestBed.cpp
      Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.cpp
-     Classes/Box2DTestBed/Test.cpp
+     Classes/Box2DTestBed/test.cpp
 
     Classes/Box2DTestBed/tests/add_pair.cpp
     Classes/Box2DTestBed/tests/apply_force.cpp
@@ -439,6 +437,7 @@ if(WINDOWS)
     Classes/Box2DTestBed/tests/wrecking_ball.cpp
      )
 endif()
+
 list(APPEND GAME_HEADER
      Classes/Physics3DTest/Physics3DTest.h
      Classes/NavMeshTest/NavMeshTest.h
@@ -451,18 +450,17 @@ list(APPEND GAME_HEADER
      Classes/PhysicsTest/PhysicsTest.h
      Classes/ChipmunkTest/ChipmunkTest.h
 	 )
-if(WINDOWS)
-	list(APPEND GAME_HEADER
-	    Classes/ChipmunkTestBed/Demo/ChipmunkDemo.h
-		Classes/ChipmunkTestBed/ChipmunkTestBed.h
-	)
-endif()
 
 list(APPEND GAME_SOURCE
      Classes/PhysicsTest/PhysicsTest.cpp
      Classes/ChipmunkTest/ChipmunkTest.cpp
 	 )
+
 if(WINDOWS OR MACOSX OR LINUX)
+	list(APPEND GAME_HEADER
+	    Classes/ChipmunkTestBed/demo/ChipmunkDemo.h
+		Classes/ChipmunkTestBed/ChipmunkTestBed.h
+	)
    set (TESTBED_C_SORUCES
         Classes/ChipmunkTestBed/demo/Bench.c
         Classes/ChipmunkTestBed/demo/Chains.c
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h b/tests/cpp-tests/Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
index 226ae8d293..b231aacbe7 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
+++ b/tests/cpp-tests/Classes/Box2DTestBed/CCPhysicsDebugNodeBox2D.h
@@ -19,7 +19,7 @@
 #ifndef __PHYSICSNODES_DEBUGNODE_BOX2D_H__
 #define __PHYSICSNODES_DEBUGNODE_BOX2D_H__
 
-#include "Box2D/Box2D.h"
+#include "box2d/box2d.h"
 #include "cocos2d.h"
 
 struct b2AABB;
diff --git a/tests/cpp-tests/Classes/Box2DTestBed/Test.h b/tests/cpp-tests/Classes/Box2DTestBed/Test.h
index 05a8045632..2a3cd63a3a 100644
--- a/tests/cpp-tests/Classes/Box2DTestBed/Test.h
+++ b/tests/cpp-tests/Classes/Box2DTestBed/Test.h
@@ -19,7 +19,7 @@
 #ifndef TEST_H
 #define TEST_H
 
-#include "Box2D/Box2D.h"
+#include "box2d/box2d.h"
 #include "CCPhysicsDebugNodeBox2D.h"
 
 #include <cstdlib>
diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp
index 7f13888d6d..9f991eec05 100644
--- a/tests/cpp-tests/Classes/controller.cpp
+++ b/tests/cpp-tests/Classes/controller.cpp
@@ -56,7 +56,7 @@ public:
 
 
         addTest("Box2D - Basic", []() { return new (std::nothrow) Box2DTests(); });
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+#if defined(CC_PLATFORM_PC)
         addTest("Box2D - TestBed", []() { return new (std::nothrow) Box2DTestBedTests(); });
 #endif
         addTest("Chipmunk2D - Basic", []() { return new ChipmunkTests(); });