diff --git a/bin/hbase-config.cmd b/bin/hbase-config.cmd
index b4f8bc5d8d1..6c3e877575c 100644
--- a/bin/hbase-config.cmd
+++ b/bin/hbase-config.cmd
@@ -29,12 +29,12 @@ if not defined JAVA_HOME (
   set JAVA_HOME=c:\apps\java
 )
 
-if not exist %JAVA_HOME%\bin\java.exe (
+if not exist "%JAVA_HOME%\bin\java.exe" (
   echo Error: JAVA_HOME is incorrectly set or could not find java at the location %JAVA_HOME%\bin\
   exit /B 2
 )
 
-set JAVA=%JAVA_HOME%\bin\java
+set JAVA="%JAVA_HOME%\bin\java"
 
 for %%i in (%0) do (
   if not defined HBASE_BIN_PATH (
diff --git a/bin/hbase.cmd b/bin/hbase.cmd
index 0094b11fba8..0cc9f785aba 100644
--- a/bin/hbase.cmd
+++ b/bin/hbase.cmd
@@ -82,7 +82,7 @@ if not "%HBASE_HEAPSIZE%" == "" (
   set JAVA_HEAP_MAX=-Xmx%HBASE_HEAPSIZE%m
 )
 
-set CLASSPATH=%HBASE_CONF_DIR%;%JAVA_HOME%\lib\tools.jar
+set CLASSPATH=%HBASE_CONF_DIR%;"%JAVA_HOME%\lib\tools.jar"
 
 rem Add maven target directory
 set cached_classpath_filename=%HBASE_HOME%\target\cached_classpath.txt