diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java
index b5782f1f..0fa596ee 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java
@@ -27,7 +27,7 @@ import org.springframework.core.Ordered;
 @ConfigurationProperties("spring.cloud.config.server.jdbc")
 public class JdbcEnvironmentProperties implements EnvironmentRepositoryProperties {
 
-	private static final String DEFAULT_SQL = "SELECT KEY, VALUE from PROPERTIES"
+	private static final String DEFAULT_SQL = "SELECT \"KEY\", \"VALUE\" from PROPERTIES"
 			+ " where APPLICATION=? and PROFILE=? and LABEL=?";
 
 	/**
diff --git a/spring-cloud-config-server/src/test/resources/data-jdbc.sql b/spring-cloud-config-server/src/test/resources/data-jdbc.sql
index 7c800d14..12fbce0c 100644
--- a/spring-cloud-config-server/src/test/resources/data-jdbc.sql
+++ b/spring-cloud-config-server/src/test/resources/data-jdbc.sql
@@ -1,2 +1,2 @@
-INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, KEY, VALUE) values ('application', 'default', 'master', 'a.b', 'y');
-INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, KEY, VALUE) values ('foo', 'bar', 'master', 'a.b.c', 'x');
+INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, "KEY", "VALUE") values ('application', 'default', 'master', 'a.b', 'y');
+INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, "KEY", "VALUE") values ('foo', 'bar', 'master', 'a.b.c', 'x');
diff --git a/spring-cloud-config-server/src/test/resources/schema-jdbc.sql b/spring-cloud-config-server/src/test/resources/schema-jdbc.sql
index a596350f..93b4c5aa 100644
--- a/spring-cloud-config-server/src/test/resources/schema-jdbc.sql
+++ b/spring-cloud-config-server/src/test/resources/schema-jdbc.sql
@@ -1,6 +1,6 @@
 CREATE TABLE PROPERTIES (
-  KEY VARCHAR(2048),
-  VALUE VARCHAR(4096),
+  "KEY" VARCHAR(2048),
+  "VALUE" VARCHAR(4096),
   APPLICATION VARCHAR(128),
   PROFILE VARCHAR(128),
   LABEL VARCHAR(128)