diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c
new file mode 100644
index 0000000000..8e771afaeb
--- /dev/null
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.c
@@ -0,0 +1,27 @@
+/** @file
+  This is THE shell (application)
+
+  Copyright (c) 2009, Intel Corporation                                                         
+  All rights reserved. This program and the accompanying materials                          
+  are licensed and made available under the terms and conditions of the BSD License         
+  which accompanies this distribution.  The full text of the license may be found at        
+  http://opensource.org/licenses/bsd-license.php                                            
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+**/
+
+#include <Uefi.h>
+
+#include <Library/UefiLib.h>
+#include <Library/DebugLib.h>
+
+INT32 
+EFIAPI 
+main(
+  UINTN Argc, 
+  CHAR16 **Argv
+  ){
+  Print(L"Test Complete\r\n");
+}
\ No newline at end of file
diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
new file mode 100644
index 0000000000..9175a376c7
--- /dev/null
+++ b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -0,0 +1,46 @@
+#/** @file
+#  This is the shell application
+#
+#  Copyright (c) 2009, Intel Corporation.
+#
+#  All rights reserved. This program and the accompanying materials
+#  are licensed and made available under the terms and conditions of the BSD License
+#  which accompanies this distribution. The full text of the license may be found at
+#  http://opensource.org/licenses/bsd-license.php
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+#**/
+
+[Defines]
+  INF_VERSION                    = 0x00010006
+  BASE_NAME                      = ShellCTestApp
+  FILE_GUID                      = 7a6ca3b8-ee1b-489c-b300-24544a7bd418
+  MODULE_TYPE                    = UEFI_APPLICATION
+  VERSION_STRING                 = 1.0
+  ENTRY_POINT                    = ShellCEntryLib
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC
+#
+
+[Sources]
+  ShellCTestApp.c
+
+[Packages]
+  MdePkg/MdePkg.dec
+  ShellPkg/ShellPkg.dec
+  
+[LibraryClasses]
+  ShellCEntryLib
+  UefiLib
+  
+[Guids]
+
+[Protocols]
+
+
+[Pcd]
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index 70e6fbc1a2..97eb76e965 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -48,6 +48,5 @@
   ShellPkg/Application/ShellLibTestApp/SA3.inf
   ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.inf
   ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-  ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+  ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
   ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
\ No newline at end of file