diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
index cd7491e13cfacccb48d46f4afe5d7900925e7b53..d9c7533628fb8e3e8fada908129b27e7e7d05bfd 100644
--- a/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
+++ b/apollo-client/src/main/java/com/ctrip/framework/apollo/util/ConfigUtil.java
@@ -65,6 +65,14 @@ public class ConfigUtil {
     //Load data center from system property
     cluster = System.getProperty(ConfigConsts.APOLLO_CLUSTER_KEY);
 
+    String env = Foundation.server().getEnvType();
+    //LPT and DEV will be treated as a cluster(lower case)
+    if (Strings.isNullOrEmpty(cluster) &&
+        (Env.DEV.name().equalsIgnoreCase(env) || Env.LPT.name().equalsIgnoreCase(env))
+        ) {
+      cluster = env.toLowerCase();
+    }
+
     //Use TOOLING cluster if tooling=true in server.properties
     if (Strings.isNullOrEmpty(cluster) && isToolingZone()) {
       cluster = TOOLING_CLUSTER;