diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj
index a92f5bfe5f..31ff531727 100644
--- a/build/cocos2d_tests.xcodeproj/project.pbxproj
+++ b/build/cocos2d_tests.xcodeproj/project.pbxproj
@@ -441,8 +441,6 @@
 		1AC35C0818CECF0C00F37B72 /* MouseTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9618CECF0B00F37B72 /* MouseTest.cpp */; };
 		1AC35C0918CECF0C00F37B72 /* IntervalTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */; };
 		1AC35C0A18CECF0C00F37B72 /* IntervalTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */; };
-		1AC35C0B18CECF0C00F37B72 /* KeyboardTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9C18CECF0B00F37B72 /* KeyboardTest.cpp */; };
-		1AC35C0C18CECF0C00F37B72 /* KeyboardTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35A9C18CECF0B00F37B72 /* KeyboardTest.cpp */; };
 		1AC35C0F18CECF0C00F37B72 /* LabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */; };
 		1AC35C1018CECF0C00F37B72 /* LabelTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */; };
 		1AC35C1118CECF0C00F37B72 /* LabelTestNew.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */; };
@@ -1543,8 +1541,6 @@
 		1AC35A9718CECF0B00F37B72 /* MouseTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseTest.h; sourceTree = "<group>"; };
 		1AC35A9918CECF0B00F37B72 /* IntervalTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntervalTest.cpp; sourceTree = "<group>"; };
 		1AC35A9A18CECF0B00F37B72 /* IntervalTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntervalTest.h; sourceTree = "<group>"; };
-		1AC35A9C18CECF0B00F37B72 /* KeyboardTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyboardTest.cpp; sourceTree = "<group>"; };
-		1AC35A9D18CECF0B00F37B72 /* KeyboardTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardTest.h; sourceTree = "<group>"; };
 		1AC35AA218CECF0C00F37B72 /* LabelTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LabelTest.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		1AC35AA318CECF0C00F37B72 /* LabelTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelTest.h; sourceTree = "<group>"; };
 		1AC35AA418CECF0C00F37B72 /* LabelTestNew.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LabelTestNew.cpp; sourceTree = "<group>"; };
@@ -2240,7 +2236,6 @@
 				1AC35A9218CECF0B00F37B72 /* FontTest */,
 				1AC35A9518CECF0B00F37B72 /* InputTest */,
 				1AC35A9818CECF0B00F37B72 /* IntervalTest */,
-				1AC35A9B18CECF0B00F37B72 /* KeyboardTest */,
 				1AC35AA118CECF0B00F37B72 /* LabelTest */,
 				1AC35AA618CECF0C00F37B72 /* LayerTest */,
 				1AC35AA918CECF0C00F37B72 /* MenuTest */,
@@ -2890,15 +2885,6 @@
 			path = IntervalTest;
 			sourceTree = "<group>";
 		};
-		1AC35A9B18CECF0B00F37B72 /* KeyboardTest */ = {
-			isa = PBXGroup;
-			children = (
-				1AC35A9C18CECF0B00F37B72 /* KeyboardTest.cpp */,
-				1AC35A9D18CECF0B00F37B72 /* KeyboardTest.h */,
-			);
-			path = KeyboardTest;
-			sourceTree = "<group>";
-		};
 		1AC35AA118CECF0B00F37B72 /* LabelTest */ = {
 			isa = PBXGroup;
 			children = (
@@ -4731,7 +4717,6 @@
 				1AC35C3B18CECF0C00F37B72 /* PerformanceTouchesTest.cpp in Sources */,
 				29080D8F191B595E0066F8DF /* CocoStudioGUITest.cpp in Sources */,
 				1AC35B3D18CECF0C00F37B72 /* Bug-422.cpp in Sources */,
-				1AC35C0B18CECF0C00F37B72 /* KeyboardTest.cpp in Sources */,
 				1AC35BF518CECF0C00F37B72 /* HttpClientTest.cpp in Sources */,
 				1AC35B4F18CECF0C00F37B72 /* ClickAndMoveTest.cpp in Sources */,
 				29080DCF191B595E0066F8DF /* UISliderTest.cpp in Sources */,
@@ -4912,7 +4897,6 @@
 				29080DA2191B595E0066F8DF /* GUIEditorTest.cpp in Sources */,
 				29080D94191B595E0066F8DF /* CustomImageTest.cpp in Sources */,
 				1AC35B3E18CECF0C00F37B72 /* Bug-422.cpp in Sources */,
-				1AC35C0C18CECF0C00F37B72 /* KeyboardTest.cpp in Sources */,
 				29080DAC191B595E0066F8DF /* UIFocusTest.cpp in Sources */,
 				1AC35BF618CECF0C00F37B72 /* HttpClientTest.cpp in Sources */,
 				29080DA6191B595E0066F8DF /* UIButtonTest_Editor.cpp in Sources */,
diff --git a/tests/cpp-tests/Android.mk b/tests/cpp-tests/Android.mk
index 0a6a8eeda8..cedc1f75aa 100644
--- a/tests/cpp-tests/Android.mk
+++ b/tests/cpp-tests/Android.mk
@@ -129,7 +129,6 @@ Classes/FileUtilsTest/FileUtilsTest.cpp \
 Classes/FontTest/FontTest.cpp \
 Classes/InputTest/MouseTest.cpp \
 Classes/IntervalTest/IntervalTest.cpp \
-Classes/KeyboardTest/KeyboardTest.cpp \
 Classes/LabelTest/LabelTest.cpp \
 Classes/LabelTest/LabelTestNew.cpp \
 Classes/LayerTest/LayerTest.cpp \
diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt
index d97cdac83c..b515c3835b 100644
--- a/tests/cpp-tests/CMakeLists.txt
+++ b/tests/cpp-tests/CMakeLists.txt
@@ -124,7 +124,6 @@ set(SAMPLE_SRC
   Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
   Classes/FontTest/FontTest.cpp
   Classes/IntervalTest/IntervalTest.cpp
-  Classes/KeyboardTest/KeyboardTest.cpp
   Classes/InputTest/MouseTest.cpp
   Classes/LabelTest/LabelTest.cpp
   Classes/LabelTest/LabelTestNew.cpp
diff --git a/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp b/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp
deleted file mode 100644
index 10b2eaebf1..0000000000
--- a/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "KeyboardTest.h"
-
-KeyboardTest::KeyboardTest()
-{
-    auto s = Director::getInstance()->getWinSize();
-    auto label = Label::createWithTTF("Keyboard Test", "fonts/arial.ttf", 28);
-    addChild(label, 0);
-    label->setPosition( Vec2(s.width/2, s.height-50) );
-
-    auto listener = EventListenerKeyboard::create();
-    listener->onKeyPressed = CC_CALLBACK_2(KeyboardTest::onKeyPressed, this);
-    listener->onKeyReleased = CC_CALLBACK_2(KeyboardTest::onKeyReleased, this);
-    
-    _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-    
-    // create a label to display the tip string
-    _label = Label::createWithTTF("Please press any key and see console log...", "fonts/arial.ttf", 22);
-    _label->setPosition(Vec2(s.width / 2, s.height / 2));
-    addChild(_label, 0);
-    
-    _label->retain();
-}
-
-KeyboardTest::~KeyboardTest()
-{
-    _label->release();
-}
-
-void KeyboardTest::onKeyPressed(EventKeyboard::KeyCode keyCode, Event* event)
-{
-    log("Key with keycode %d pressed", keyCode);
-}
-
-void KeyboardTest::onKeyReleased(EventKeyboard::KeyCode keyCode, Event* event)
-{
-    log("Key with keycode %d released", keyCode);
-}
-
-void KeyboardTestScene::runThisTest()
-{
-    auto layer = new KeyboardTest();
-    addChild(layer);
-
-    Director::getInstance()->replaceScene(this);
-    layer->release();
-}
-
diff --git a/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.h b/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.h
deleted file mode 100644
index 6492df7107..0000000000
--- a/tests/cpp-tests/Classes/KeyboardTest/KeyboardTest.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _KEYBOARD_TEST_H_
-#define _KEYBOARD_TEST_H_
-
-#include "cocos2d.h"
-#include "../testBasic.h"
-
-class KeyboardTest : public Layer
-{
-public:
-    KeyboardTest();
-    ~KeyboardTest();
-
-    void onKeyPressed(EventKeyboard::KeyCode keyCode, Event* event);
-    void onKeyReleased(EventKeyboard::KeyCode keyCode, Event* event);
-
-private:
-    Label*            _label;
-};
-
-class KeyboardTestScene : public TestScene
-{
-public:
-    virtual void runThisTest();
-};
-
-
-#endif
diff --git a/tests/cpp-tests/Classes/controller.cpp b/tests/cpp-tests/Classes/controller.cpp
index afcc61248c..519a049d7e 100644
--- a/tests/cpp-tests/Classes/controller.cpp
+++ b/tests/cpp-tests/Classes/controller.cpp
@@ -68,7 +68,6 @@ Controller g_aTestNames[] = {
 	{ "FileUtils", []() { return new FileUtilsTestScene(); } },
 	{ "Fonts", []() { return new FontTestScene(); } },
 	{ "Interval", [](){return new IntervalTestScene(); } },
-	{ "Keyboard", []() { return new KeyboardTestScene(); } },
 	{ "Node: Clipping", []() { return new ClippingNodeTestScene(); } },
 	{ "Node: Draw", [](){return new DrawPrimitivesTestScene();} },
     { "Node: Label - New API", [](){return new AtlasTestSceneNew(); } },
diff --git a/tests/cpp-tests/Classes/tests.h b/tests/cpp-tests/Classes/tests.h
index 7ed638fce9..1a552f9bbc 100644
--- a/tests/cpp-tests/Classes/tests.h
+++ b/tests/cpp-tests/Classes/tests.h
@@ -32,7 +32,6 @@
 #include "Box2DTest/Box2dTest.h"
 #include "Box2DTestBed/Box2dView.h"
 #include "EffectsAdvancedTest/EffectsAdvancedTest.h"
-#include "KeyboardTest/KeyboardTest.h"
 #include "InputTest/MouseTest.h"
 #include "PerformanceTest/PerformanceTest.h"
 #include "ZwoptexTest/ZwoptexTest.h"
diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
index f309005911..237d58b5ac 100644
--- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
+++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj
@@ -170,7 +170,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClCompile Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp" />
     <ClCompile Include="..\Classes\FileUtilsTest\FileUtilsTest.cpp" />
     <ClCompile Include="..\Classes\InputTest\MouseTest.cpp" />
-    <ClCompile Include="..\Classes\KeyboardTest\KeyboardTest.cpp" />
     <ClCompile Include="..\Classes\LabelTest\LabelTestNew.cpp" />
     <ClCompile Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
     <ClCompile Include="..\Classes\NewRendererTest\NewRendererTest.cpp" />
@@ -264,7 +263,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClCompile Include="..\Classes\SchedulerTest\SchedulerTest.cpp" />
     <ClCompile Include="..\Classes\RenderTextureTest\RenderTextureTest.cpp" />
     <ClCompile Include="..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.cpp" />
-    <ClCompile Include="..\Classes\KeypadTest\KeypadTest.cpp" />
     <ClCompile Include="..\Classes\CocosDenshionTest\CocosDenshionTest.cpp" />
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceNodeChildrenTest.cpp" />
     <ClCompile Include="..\Classes\PerformanceTest\PerformanceParticleTest.cpp" />
@@ -292,7 +290,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClCompile Include="..\Classes\FontTest\FontTest.cpp" />
     <ClCompile Include="..\Classes\CurrentLanguageTest\CurrentLanguageTest.cpp" />
     <ClCompile Include="..\Classes\TextureCacheTest\TextureCacheTest.cpp" />
-    <ClCompile Include="..\Classes\AccelerometerTest\AccelerometerTest.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\ExtensionsTest.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.cpp" />
@@ -354,7 +351,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClInclude Include="..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h" />
     <ClInclude Include="..\Classes\FileUtilsTest\FileUtilsTest.h" />
     <ClInclude Include="..\Classes\InputTest\MouseTest.h" />
-    <ClInclude Include="..\Classes\KeyboardTest\KeyboardTest.h" />
     <ClInclude Include="..\Classes\LabelTest\LabelTestNew.h" />
     <ClInclude Include="..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
     <ClInclude Include="..\Classes\NewRendererTest\NewRendererTest.h" />
@@ -450,7 +446,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClInclude Include="..\Classes\SchedulerTest\SchedulerTest.h" />
     <ClInclude Include="..\Classes\RenderTextureTest\RenderTextureTest.h" />
     <ClInclude Include="..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.h" />
-    <ClInclude Include="..\Classes\KeypadTest\KeypadTest.h" />
     <ClInclude Include="..\Classes\CocosDenshionTest\CocosDenshionTest.h" />
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceNodeChildrenTest.h" />
     <ClInclude Include="..\Classes\PerformanceTest\PerformanceParticleTest.h" />
@@ -478,7 +473,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(Ou
     <ClInclude Include="..\Classes\FontTest\FontTest.h" />
     <ClInclude Include="..\Classes\CurrentLanguageTest\CurrentLanguageTest.h" />
     <ClInclude Include="..\Classes\TextureCacheTest\TextureCacheTest.h" />
-    <ClInclude Include="..\Classes\AccelerometerTest\AccelerometerTest.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\ExtensionsTest.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.h" />
diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters
index b3b2ea21a9..50a8aae63b 100644
--- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters
+++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters
@@ -76,9 +76,6 @@
     <Filter Include="Classes\EffectsAdvancedTest">
       <UniqueIdentifier>{6eeb2da8-4ecb-4602-9ac5-80caabe39ee6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\KeypadTest">
-      <UniqueIdentifier>{34e82723-7a60-4bed-ba19-de427c04d212}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\CocosDenshionTest">
       <UniqueIdentifier>{a786a2de-3545-4fdc-9884-5a8c68bf8eb8}</UniqueIdentifier>
     </Filter>
@@ -115,9 +112,6 @@
     <Filter Include="Classes\TextureCacheTest">
       <UniqueIdentifier>{1cf546eb-abc6-4b66-a85e-66a68f82b536}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\AccelerometerTest">
-      <UniqueIdentifier>{0a4490ab-a3f5-4ccf-9b5d-ce03d80d4004}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\ExtensionsTest">
       <UniqueIdentifier>{897838bb-90e6-492d-adcb-e719415c37b0}</UniqueIdentifier>
     </Filter>
@@ -244,9 +238,6 @@
     <Filter Include="Classes\PhysicsTest">
       <UniqueIdentifier>{a83cb042-e3d6-4d3b-a4f6-30a4b3fcb3e9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\KeyboardTest">
-      <UniqueIdentifier>{8d7d37cd-5cc2-4a7d-9bd2-7b5c928adbb5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\InputTest">
       <UniqueIdentifier>{8e8124bd-adb2-4a8f-8727-9868a9c42d80}</UniqueIdentifier>
     </Filter>
@@ -423,9 +414,6 @@
     <ClCompile Include="..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.cpp">
       <Filter>Classes\EffectsAdvancedTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\KeypadTest\KeypadTest.cpp">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\Classes\CocosDenshionTest\CocosDenshionTest.cpp">
       <Filter>Classes\CocosDenshionTest</Filter>
     </ClCompile>
@@ -507,9 +495,6 @@
     <ClCompile Include="..\Classes\TextureCacheTest\TextureCacheTest.cpp">
       <Filter>Classes\TextureCacheTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\AccelerometerTest\AccelerometerTest.cpp">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\Classes\ExtensionsTest\ExtensionsTest.cpp">
       <Filter>Classes\ExtensionsTest</Filter>
     </ClCompile>
@@ -666,9 +651,6 @@
     <ClCompile Include="..\Classes\PhysicsTest\PhysicsTest.cpp">
       <Filter>Classes\PhysicsTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\Classes\KeyboardTest\KeyboardTest.cpp">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\Classes\InputTest\MouseTest.cpp">
       <Filter>Classes\InputTest</Filter>
     </ClCompile>
@@ -953,9 +935,6 @@
     <ClInclude Include="..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.h">
       <Filter>Classes\EffectsAdvancedTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\Classes\KeypadTest\KeypadTest.h">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\Classes\CocosDenshionTest\CocosDenshionTest.h">
       <Filter>Classes\CocosDenshionTest</Filter>
     </ClInclude>
@@ -1036,10 +1015,6 @@
     </ClInclude>
     <ClInclude Include="..\Classes\TextureCacheTest\TextureCacheTest.h">
       <Filter>Classes\TextureCacheTest</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AccelerometerTest\AccelerometerTest.h">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\Classes\ExtensionsTest\ExtensionsTest.h">
       <Filter>Classes\ExtensionsTest</Filter>
     </ClInclude>
@@ -1367,9 +1342,6 @@
     <ClInclude Include="..\Classes\PhysicsTest\PhysicsTest.h">
       <Filter>Classes\PhysicsTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\Classes\KeyboardTest\KeyboardTest.h">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\Classes\InputTest\MouseTest.h">
       <Filter>Classes\InputTest</Filter>
     </ClInclude>
diff --git a/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj
index 19843f104e..b29642acdf 100644
--- a/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj
+++ b/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj
@@ -183,7 +183,6 @@
     <ClCompile Include="..\..\..\..\cocos\2d\platform\wp8-xaml\DirectXBase.cpp" />
     <ClCompile Include="..\..\..\..\cocos\2d\platform\wp8-xaml\EditBoxEvent.cpp" />
     <ClCompile Include="..\..\..\..\cocos\2d\platform\wp8-xaml\InputEvent.cpp" />
-    <ClCompile Include="..\..\..\Classes\AccelerometerTest\AccelerometerTest.cpp" />
     <ClCompile Include="..\..\..\Classes\ActionManagerTest\ActionManagerTest.cpp" />
     <ClCompile Include="..\..\..\Classes\ActionsEaseTest\ActionsEaseTest.cpp" />
     <ClCompile Include="..\..\..\Classes\ActionsProgressTest\ActionsProgressTest.cpp" />
@@ -268,8 +267,6 @@
     <ClCompile Include="..\..\..\Classes\FontTest\FontTest.cpp" />
     <ClCompile Include="..\..\..\Classes\InputTest\MouseTest.cpp" />
     <ClCompile Include="..\..\..\Classes\IntervalTest\IntervalTest.cpp" />
-    <ClCompile Include="..\..\..\Classes\KeyboardTest\KeyboardTest.cpp" />
-    <ClCompile Include="..\..\..\Classes\KeypadTest\KeypadTest.cpp" />
     <ClCompile Include="..\..\..\Classes\LabelTest\LabelTest.cpp" />
     <ClCompile Include="..\..\..\Classes\LabelTest\LabelTestNew.cpp" />
     <ClCompile Include="..\..\..\Classes\LayerTest\LayerTest.cpp" />
@@ -328,7 +325,6 @@
     <ClInclude Include="..\..\..\..\cocos\2d\platform\wp8-xaml\EditBoxEvent.h" />
     <ClInclude Include="..\..\..\..\cocos\2d\platform\wp8-xaml\InputEvent.h" />
     <ClInclude Include="..\..\..\..\cocos\2d\platform\wp8-xaml\InputEventTypes.h" />
-    <ClInclude Include="..\..\..\Classes\AccelerometerTest\AccelerometerTest.h" />
     <ClInclude Include="..\..\..\Classes\ActionManagerTest\ActionManagerTest.h" />
     <ClInclude Include="..\..\..\Classes\ActionsEaseTest\ActionsEaseTest.h" />
     <ClInclude Include="..\..\..\Classes\ActionsProgressTest\ActionsProgressTest.h" />
@@ -477,8 +473,6 @@
     <ClInclude Include="..\..\..\Classes\FontTest\FontTest.h" />
     <ClInclude Include="..\..\..\Classes\InputTest\MouseTest.h" />
     <ClInclude Include="..\..\..\Classes\IntervalTest\IntervalTest.h" />
-    <ClInclude Include="..\..\..\Classes\KeyboardTest\KeyboardTest.h" />
-    <ClInclude Include="..\..\..\Classes\KeypadTest\KeypadTest.h" />
     <ClInclude Include="..\..\..\Classes\LabelTest\LabelTest.h" />
     <ClInclude Include="..\..\..\Classes\LabelTest\LabelTestNew.h" />
     <ClInclude Include="..\..\..\Classes\LayerTest\LayerTest.h" />
diff --git a/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj.filters
index b774d3ff8c..e17eaefc0b 100644
--- a/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj.filters
+++ b/tests/cpp-tests/proj.wp8-xaml/TestCpp/TestCppComponent/TestCppComponent.vcxproj.filters
@@ -4,9 +4,6 @@
     <Filter Include="Classes">
       <UniqueIdentifier>{93d0a037-2d39-405e-bcbd-1fc145864722}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\AccelerometerTest">
-      <UniqueIdentifier>{363b8049-7ead-47e9-87a4-54937a9dd336}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\ActionManagerTest">
       <UniqueIdentifier>{9152809d-3942-4fee-a9e7-4c80694c197e}</UniqueIdentifier>
     </Filter>
@@ -208,12 +205,6 @@
     <Filter Include="Classes\IntervalTest">
       <UniqueIdentifier>{4987366e-5062-4719-bdeb-d098e0c1406c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\KeyboardTest">
-      <UniqueIdentifier>{fb894f07-e61e-4094-aaf2-038ea1bb9250}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes\KeypadTest">
-      <UniqueIdentifier>{2a93c1ef-7a60-417f-a140-ac144caf4271}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\LabelTest">
       <UniqueIdentifier>{fe4f901a-eec1-4f49-833b-fccf28979a65}</UniqueIdentifier>
     </Filter>
@@ -321,9 +312,6 @@
     <ClCompile Include="..\..\..\Classes\VisibleRect.cpp">
       <Filter>Classes</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Classes\AccelerometerTest\AccelerometerTest.cpp">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Classes\ActionManagerTest\ActionManagerTest.cpp">
       <Filter>Classes\ActionManagerTest</Filter>
     </ClCompile>
@@ -567,12 +555,6 @@
     <ClCompile Include="..\..\..\Classes\IntervalTest\IntervalTest.cpp">
       <Filter>Classes\IntervalTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Classes\KeyboardTest\KeyboardTest.cpp">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Classes\KeypadTest\KeypadTest.cpp">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Classes\LabelTest\LabelTestNew.cpp">
       <Filter>Classes\LabelTest</Filter>
     </ClCompile>
@@ -741,9 +723,6 @@
     <ClInclude Include="..\..\..\Classes\VisibleRect.h">
       <Filter>Classes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Classes\AccelerometerTest\AccelerometerTest.h">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Classes\ActionManagerTest\ActionManagerTest.h">
       <Filter>Classes\ActionManagerTest</Filter>
     </ClInclude>
@@ -1179,12 +1158,6 @@
     <ClInclude Include="..\..\..\Classes\IntervalTest\IntervalTest.h">
       <Filter>Classes\IntervalTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Classes\KeyboardTest\KeyboardTest.h">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\Classes\KeypadTest\KeypadTest.h">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Classes\LabelTest\LabelTestNew.h">
       <Filter>Classes\LabelTest</Filter>
     </ClInclude>
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
index 0108b08538..9eea016aad 100644
--- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
+++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
@@ -214,7 +214,6 @@
     <ClCompile Include="..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.cpp" />
     <ClCompile Include="..\..\Classes\FileUtilsTest\FileUtilsTest.cpp" />
     <ClCompile Include="..\..\Classes\InputTest\MouseTest.cpp" />
-    <ClCompile Include="..\..\Classes\KeyboardTest\KeyboardTest.cpp" />
     <ClCompile Include="..\..\Classes\LabelTest\LabelTestNew.cpp" />
     <ClCompile Include="..\..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.cpp" />
     <ClCompile Include="..\..\Classes\NewRendererTest\NewRendererTest.cpp" />
@@ -307,7 +306,6 @@
     <ClCompile Include="..\..\Classes\SchedulerTest\SchedulerTest.cpp" />
     <ClCompile Include="..\..\Classes\RenderTextureTest\RenderTextureTest.cpp" />
     <ClCompile Include="..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.cpp" />
-    <ClCompile Include="..\..\Classes\KeypadTest\KeypadTest.cpp" />
     <ClCompile Include="..\..\Classes\CocosDenshionTest\CocosDenshionTest.cpp" />
     <ClCompile Include="..\..\Classes\PerformanceTest\PerformanceNodeChildrenTest.cpp" />
     <ClCompile Include="..\..\Classes\PerformanceTest\PerformanceParticleTest.cpp" />
@@ -334,7 +332,6 @@
     <ClCompile Include="..\..\Classes\FontTest\FontTest.cpp" />
     <ClCompile Include="..\..\Classes\CurrentLanguageTest\CurrentLanguageTest.cpp" />
     <ClCompile Include="..\..\Classes\TextureCacheTest\TextureCacheTest.cpp" />
-    <ClCompile Include="..\..\Classes\AccelerometerTest\AccelerometerTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\ExtensionsTest.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.cpp" />
     <ClCompile Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.cpp" />
@@ -413,7 +410,6 @@
     <ClInclude Include="..\..\Classes\ExtensionsTest\TableViewTest\TableViewTestScene.h" />
     <ClInclude Include="..\..\Classes\FileUtilsTest\FileUtilsTest.h" />
     <ClInclude Include="..\..\Classes\InputTest\MouseTest.h" />
-    <ClInclude Include="..\..\Classes\KeyboardTest\KeyboardTest.h" />
     <ClInclude Include="..\..\Classes\LabelTest\LabelTestNew.h" />
     <ClInclude Include="..\..\Classes\NewEventDispatcherTest\NewEventDispatcherTest.h" />
     <ClInclude Include="..\..\Classes\NewRendererTest\NewRendererTest.h" />
@@ -508,7 +504,6 @@
     <ClInclude Include="..\..\Classes\SchedulerTest\SchedulerTest.h" />
     <ClInclude Include="..\..\Classes\RenderTextureTest\RenderTextureTest.h" />
     <ClInclude Include="..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.h" />
-    <ClInclude Include="..\..\Classes\KeypadTest\KeypadTest.h" />
     <ClInclude Include="..\..\Classes\CocosDenshionTest\CocosDenshionTest.h" />
     <ClInclude Include="..\..\Classes\PerformanceTest\PerformanceNodeChildrenTest.h" />
     <ClInclude Include="..\..\Classes\PerformanceTest\PerformanceParticleTest.h" />
@@ -535,7 +530,6 @@
     <ClInclude Include="..\..\Classes\FontTest\FontTest.h" />
     <ClInclude Include="..\..\Classes\CurrentLanguageTest\CurrentLanguageTest.h" />
     <ClInclude Include="..\..\Classes\TextureCacheTest\TextureCacheTest.h" />
-    <ClInclude Include="..\..\Classes\AccelerometerTest\AccelerometerTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\ExtensionsTest.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlScene.h" />
     <ClInclude Include="..\..\Classes\ExtensionsTest\ControlExtensionTest\CCControlSceneManager.h" />
diff --git a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
index 556e8a3efc..5bb18d7352 100644
--- a/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
+++ b/tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
@@ -73,9 +73,6 @@
     <Filter Include="Classes\EffectsAdvancedTest">
       <UniqueIdentifier>{6eeb2da8-4ecb-4602-9ac5-80caabe39ee6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\KeypadTest">
-      <UniqueIdentifier>{34e82723-7a60-4bed-ba19-de427c04d212}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\CocosDenshionTest">
       <UniqueIdentifier>{a786a2de-3545-4fdc-9884-5a8c68bf8eb8}</UniqueIdentifier>
     </Filter>
@@ -112,9 +109,6 @@
     <Filter Include="Classes\TextureCacheTest">
       <UniqueIdentifier>{1cf546eb-abc6-4b66-a85e-66a68f82b536}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\AccelerometerTest">
-      <UniqueIdentifier>{0a4490ab-a3f5-4ccf-9b5d-ce03d80d4004}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\ExtensionsTest">
       <UniqueIdentifier>{897838bb-90e6-492d-adcb-e719415c37b0}</UniqueIdentifier>
     </Filter>
@@ -241,9 +235,6 @@
     <Filter Include="Classes\PhysicsTest">
       <UniqueIdentifier>{a83cb042-e3d6-4d3b-a4f6-30a4b3fcb3e9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Classes\KeyboardTest">
-      <UniqueIdentifier>{8d7d37cd-5cc2-4a7d-9bd2-7b5c928adbb5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Classes\InputTest">
       <UniqueIdentifier>{8e8124bd-adb2-4a8f-8727-9868a9c42d80}</UniqueIdentifier>
     </Filter>
@@ -417,9 +408,6 @@
     <ClCompile Include="..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.cpp">
       <Filter>Classes\EffectsAdvancedTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Classes\KeypadTest\KeypadTest.cpp">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Classes\CocosDenshionTest\CocosDenshionTest.cpp">
       <Filter>Classes\CocosDenshionTest</Filter>
     </ClCompile>
@@ -498,9 +486,6 @@
     <ClCompile Include="..\..\Classes\TextureCacheTest\TextureCacheTest.cpp">
       <Filter>Classes\TextureCacheTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Classes\AccelerometerTest\AccelerometerTest.cpp">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Classes\ExtensionsTest\ExtensionsTest.cpp">
       <Filter>Classes\ExtensionsTest</Filter>
     </ClCompile>
@@ -645,9 +630,6 @@
     <ClCompile Include="..\..\Classes\PhysicsTest\PhysicsTest.cpp">
       <Filter>Classes\PhysicsTest</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Classes\KeyboardTest\KeyboardTest.cpp">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Classes\InputTest\MouseTest.cpp">
       <Filter>Classes\InputTest</Filter>
     </ClCompile>
@@ -950,9 +932,6 @@
     <ClInclude Include="..\..\Classes\EffectsAdvancedTest\EffectsAdvancedTest.h">
       <Filter>Classes\EffectsAdvancedTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Classes\KeypadTest\KeypadTest.h">
-      <Filter>Classes\KeypadTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Classes\CocosDenshionTest\CocosDenshionTest.h">
       <Filter>Classes\CocosDenshionTest</Filter>
     </ClInclude>
@@ -1031,9 +1010,6 @@
     <ClInclude Include="..\..\Classes\TextureCacheTest\TextureCacheTest.h">
       <Filter>Classes\TextureCacheTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Classes\AccelerometerTest\AccelerometerTest.h">
-      <Filter>Classes\AccelerometerTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Classes\ExtensionsTest\ExtensionsTest.h">
       <Filter>Classes\ExtensionsTest</Filter>
     </ClInclude>
@@ -1352,9 +1328,6 @@
     <ClInclude Include="..\..\Classes\PhysicsTest\PhysicsTest.h">
       <Filter>Classes\PhysicsTest</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Classes\KeyboardTest\KeyboardTest.h">
-      <Filter>Classes\KeyboardTest</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Classes\InputTest\MouseTest.h">
       <Filter>Classes\InputTest</Filter>
     </ClInclude>