diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
index ed2b75bdc88d77b38d381300ffc68812ca10d524..e346ffa823a3146dcb5e6bbf95d8ac5fb881005e 100644
--- a/programs/cmd/tests/test_builtins.cmd
+++ b/programs/cmd/tests/test_builtins.cmd
@@ -23,6 +23,21 @@ cd dummydir
 echo %~dp0
 cd ..
 rmdir dummydir
+echo %CD%
+echo %%
+echo P%
+echo %P
+echo %UNKNOWN%S
+echo P%UNKNOWN%
+echo P%UNKNOWN%S
+echo %ERRORLEVEL
+echo %ERRORLEVEL%
+echo %ERRORLEVEL%%ERRORLEVEL%
+echo %ERRORLEVEL%%
+echo %ERRORLEVEL%%%
+echo P%ERRORLEVEL%
+echo %ERRORLEVEL%S
+echo P%ERRORLEVEL%S
 
 echo ------------ Testing if/else --------------
 echo if/else should work with blocks
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 2c0e9803d30c02069a6b4276dbb9860040c20252..a8b2fc0a6056ad40fdff994e56bb54bcf27967fc 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -16,6 +16,21 @@ bar
 ~dp0 should be directory containing batch file
 @pwd@\
 @pwd@\
+@pwd@
+%
+P
+P
+S
+P
+PS
+ERRORLEVEL
+0
+00
+0
+0%
+P0
+0S
+P0S
 ------------ Testing if/else --------------
 if/else should work with blocks
 if seems to work