diff --git a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/AllTests.java b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/AllTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a82fd2dbeaef3ccba1141048a5df946e63f0a07
--- /dev/null
+++ b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/AllTests.java
@@ -0,0 +1,15 @@
+package com.ctrip.apollo.adminservice;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import com.ctrip.apollo.adminservice.controller.AppControllerTest;
+import com.ctrip.apollo.adminservice.controller.ItemSetControllerTest;
+import com.ctrip.apollo.adminservice.controller.ReleaseControllerTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({AppControllerTest.class, ReleaseControllerTest.class, ItemSetControllerTest.class})
+public class AllTests {
+
+}
diff --git a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java
index 6327dd584a7e6f03ab9d6613f00b0c102ee3390d..06da5d0c3398d8c7ad2f3869bdd9f8b2d6a3f5c8 100644
--- a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java
+++ b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/AppControllerTest.java
@@ -5,6 +5,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 
 import com.ctrip.apollo.biz.entity.App;
 import com.ctrip.apollo.biz.repository.AppRepository;
@@ -21,6 +23,7 @@ public class AppControllerTest extends AbstractControllerTest{
   }
   
   @Test
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testCreate() {
     AppDTO dto = generateSampleDTOData();
     ResponseEntity<AppDTO> response =
@@ -33,11 +36,10 @@ public class AppControllerTest extends AbstractControllerTest{
     App savedApp = appRepository.findOne(result.getId());
     Assert.assertEquals(dto.getAppId(), savedApp.getAppId());
     Assert.assertNotNull(savedApp.getDataChangeCreatedTime());
-
-    appRepository.delete(savedApp.getId());
   }
 
   @Test
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testFind() {
     AppDTO dto = generateSampleDTOData();
     App app = BeanUtils.transfrom(App.class, dto);
@@ -47,11 +49,10 @@ public class AppControllerTest extends AbstractControllerTest{
         restTemplate.getForObject(getBaseAppUrl() + dto.getAppId(), AppDTO.class);
     Assert.assertEquals(dto.getAppId(), result.getAppId());
     Assert.assertEquals(dto.getName(), result.getName());
-
-    appRepository.delete(app.getId());
   }
 
   @Test
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testFindNotExist() {
     ResponseEntity<AppDTO> result =
         restTemplate.getForEntity(getBaseAppUrl() + "notExists", AppDTO.class);
@@ -59,6 +60,7 @@ public class AppControllerTest extends AbstractControllerTest{
   }
 
   @Test
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testDelete() {
     AppDTO dto = generateSampleDTOData();
     App app = BeanUtils.transfrom(App.class, dto);
@@ -71,6 +73,7 @@ public class AppControllerTest extends AbstractControllerTest{
   }
 
   @Test
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testUpdate() {
     AppDTO dto = generateSampleDTOData();
     App app = BeanUtils.transfrom(App.class, dto);
diff --git a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java
index 18d9eab5fb326b438e1036665c9da276a87d4f54..5c3e956ec0c1df408e07fc5ac8f1923eaab548b7 100644
--- a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java
+++ b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ItemSetControllerTest.java
@@ -25,7 +25,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
 
   @Test
   @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
-  @Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testItemSetCreated() {
     String appId = "someAppId";
     AppDTO app =
@@ -72,7 +72,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
 
   @Test
   @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
-  @Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testItemSetUpdated() {
     String appId = "someAppId";
     AppDTO app =
@@ -141,7 +141,7 @@ public class ItemSetControllerTest extends AbstractControllerTest {
 
   @Test
   @Sql(scripts = "/controller/test-itemset.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
-  @Sql(scripts = "/controller/test-itemset-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testItemSetDeleted() {
     String appId = "someAppId";
     AppDTO app =
diff --git a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java
index dbac51e153b023a45b0924e0841042e4346ec5de..96d25fb598b8db486cd4d4be42ee865a67b2d1b9 100644
--- a/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java
+++ b/apollo-adminservice/src/test/java/com/ctrip/apollo/adminservice/controller/ReleaseControllerTest.java
@@ -29,7 +29,7 @@ public class ReleaseControllerTest extends AbstractControllerTest {
 
   @Test
   @Sql(scripts = "/controller/test-release.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
-  @Sql(scripts = "/controller/test-release-cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
+  @Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
   public void testReleaseBuild() {
     String appId = "someAppId";
     AppDTO app =
diff --git a/apollo-adminservice/src/test/resources/controller/test-itemset-cleanup.sql b/apollo-adminservice/src/test/resources/controller/cleanup.sql
similarity index 100%
rename from apollo-adminservice/src/test/resources/controller/test-itemset-cleanup.sql
rename to apollo-adminservice/src/test/resources/controller/cleanup.sql
diff --git a/apollo-adminservice/src/test/resources/controller/test-release-cleanup.sql b/apollo-adminservice/src/test/resources/controller/test-release-cleanup.sql
deleted file mode 100644
index d023436827302509e9f2e18e40c521e573e590f1..0000000000000000000000000000000000000000
--- a/apollo-adminservice/src/test/resources/controller/test-release-cleanup.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM Item;
-DELETE FROM Namespace;
-DELETE FROM AppNamespace;
-DELETE FROM Cluster;
-DELETE FROM App;
-
diff --git a/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java b/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java
index e257e86333ffbb7f3b7aec09a457e2f1b3d1be81..290a126470b49bd17150b0a3b7b29b3700d3aacb 100644
--- a/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java
+++ b/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/AllTests.java
@@ -7,9 +7,7 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({
-    //ConfigControllerTest.class
-})
+@SuiteClasses({ConfigControllerTest.class})
 public class AllTests {
 
 }
diff --git a/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java b/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
index 57d2eb01b4600fc66ab53cb367ac8ae86b912789..9d216dc6e3b6b1f44207b60be1ca99cff1501249 100644
--- a/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
+++ b/apollo-configservice/src/test/java/com/ctrip/apollo/configservice/controller/ConfigControllerTest.java
@@ -29,6 +29,7 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(MockitoJUnitRunner.class)
 public class ConfigControllerTest {
+
   private ConfigController configController;
   @Mock
   private ConfigService configService;
@@ -39,94 +40,89 @@ public class ConfigControllerTest {
     ReflectionTestUtils.setField(configController, "configService", configService);
   }
 
-//  @Test
-//  public void testQueryConfig() throws Exception {
-//    ApolloConfig someApolloConfig = mock(ApolloConfig.class);
-//    String someAppId = "1";
-//    String someClusterName = "someClusterName";
-//    String someGroupName = "someGroupName";
-//    long someClientSideReleaseId = 1;
-//    long someServerSideNewReleaseId = 2;
-//    HttpServletResponse someResponse = mock(HttpServletResponse.class);
-//    Release someRelease = mock(Release.class);
-//
-//    when(configService.findRelease(someAppId, someClusterName, someGroupName))
-//        .thenReturn(someRelease);
-//    when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
-//    when(configService.loadConfig(someRelease, someGroupName))
-//        .thenReturn(someApolloConfig);
-//
-//    ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName,
-//        someClientSideReleaseId, someResponse);
-//
-//    assertEquals(someApolloConfig, result);
-//    verify(configService, times(1)).findRelease(someAppId, someClusterName, someGroupName
-//        someVersinName);
-//    verify(configService, times(1)).loadConfig(someRelease, someGroupName,);
-//  }
-//
-//  @Test
-//  public void testQueryConfigWithVersionNotFound() throws Exception {
-//    String someAppId = "1";
-//    String someClusterName = "someClusterName";
-//    String someGroupName = "someGroupName";
-//    String someVersionName = "someVersion";
-//    long someClientSideReleaseId = 1;
-//    HttpServletResponse someResponse = mock(HttpServletResponse.class);
-//
-//    when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName))
-//        .thenReturn(null);
-//
-//    ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName,
-//        someVersionName, someClientSideReleaseId, someResponse);
-//
-//    assertNull(result);
-//    verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
-//  }
-//
-//  @Test
-//  public void testQueryConfigWithApolloConfigNotFound() throws Exception {
-//    String someAppId = "1";
-//    String someClusterName = "someClusterName";
-//    String someGroupName = "someGroupName";
-//    String someVersionName = "someVersion";
-//    long someClientSideReleaseId = 1;
-//    long someServerSideNewReleaseId = 2;
-//    HttpServletResponse someResponse = mock(HttpServletResponse.class);
-//    Release someRelease = mock(Release.class);
-//
-//    when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName))
-//        .thenReturn(someRelease);
-//    when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
-//    when(configService.loadConfig(someRelease, someGroupName, someVersionName)).thenReturn(null);
-//
-//    ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName,
-//        someVersionName, someClientSideReleaseId, someResponse);
-//
-//    assertNull(result);
-//    verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
-//  }
-//
-//  @Test
-//  public void testQueryConfigWithApolloConfigNotModified() throws Exception {
-//    String someAppId = "1";
-//    String someClusterName = "someClusterName";
-//    String someGroupName = "someGroupName";
-//    String someVersionName = "someVersion";
-//    long someClientSideReleaseId = 1;
-//    long someServerSideReleaseId = someClientSideReleaseId;
-//    HttpServletResponse someResponse = mock(HttpServletResponse.class);
-//    Release someRelease = mock(Release.class);
-//
-//    when(configService.findRelease(someAppId, someClusterName, someGroupName, someVersionName))
-//        .thenReturn(someRelease);
-//    when(someRelease.getId()).thenReturn(someServerSideReleaseId);
-//
-//    ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someGroupName,
-//        someVersionName, someClientSideReleaseId, someResponse);
-//
-//    assertNull(result);
-//    verify(someResponse, times(1)).setStatus(HttpServletResponse.SC_NOT_MODIFIED);
-//    verify(configService, never()).loadConfig(any(Release.class), anyString(), anyString());
-//  }
+  @Test
+  public void testQueryConfig() throws Exception {
+    ApolloConfig someApolloConfig = mock(ApolloConfig.class);
+    String someAppId = "1";
+    String someClusterName = "someClusterName";
+    String someNamespaceName = "someNamespaceName";
+    long someClientSideReleaseId = 1;
+    long someServerSideNewReleaseId = 2;
+    HttpServletResponse someResponse = mock(HttpServletResponse.class);
+    Release someRelease = mock(Release.class);
+
+    when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
+        .thenReturn(someRelease);
+    when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
+    when(configService.loadConfig(someRelease, someNamespaceName)).thenReturn(someApolloConfig);
+
+    ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
+        someNamespaceName, someClientSideReleaseId, someResponse);
+
+    assertEquals(someApolloConfig, result);
+    verify(configService, times(1)).findRelease(someAppId, someClusterName, someNamespaceName);
+    verify(configService, times(1)).loadConfig(someRelease, someNamespaceName);
+  }
+
+
+  @Test
+  public void testQueryConfigWithVersionNotFound() throws Exception {
+    String someAppId = "1";
+    String someClusterName = "someClusterName";
+    String someNamespaceName = "someNamespaceName";
+    long someClientSideReleaseId = 1;
+    HttpServletResponse someResponse = mock(HttpServletResponse.class);
+
+    when(configService.findRelease(someAppId, someClusterName, someNamespaceName)).thenReturn(null);
+
+    ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
+        someNamespaceName, someClientSideReleaseId, someResponse);
+
+    assertNull(result);
+    verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
+  }
+
+  @Test
+  public void testQueryConfigWithApolloConfigNotFound() throws Exception {
+    String someAppId = "1";
+    String someClusterName = "someClusterName";
+    String someNamespaceName = "someNamespaceName";
+    long someClientSideReleaseId = 1;
+    long someServerSideNewReleaseId = 2;
+    HttpServletResponse someResponse = mock(HttpServletResponse.class);
+    Release someRelease = mock(Release.class);
+
+    when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
+        .thenReturn(someRelease);
+    when(someRelease.getId()).thenReturn(someServerSideNewReleaseId);
+    when(configService.loadConfig(someRelease, someNamespaceName)).thenReturn(null);
+
+    ApolloConfig result = configController.queryConfig(someAppId, someClusterName,
+        someNamespaceName, someClientSideReleaseId, someResponse);
+
+    assertNull(result);
+    verify(someResponse, times(1)).sendError(eq(HttpServletResponse.SC_NOT_FOUND), anyString());
+  }
+
+  @Test
+  public void testQueryConfigWithApolloConfigNotModified() throws Exception {
+    String someAppId = "1";
+    String someClusterName = "someClusterName";
+    String someNamespaceName = "someNamespaceName";
+    long someClientSideReleaseId = 1;
+    long someServerSideReleaseId = someClientSideReleaseId;
+    HttpServletResponse someResponse = mock(HttpServletResponse.class);
+    Release someRelease = mock(Release.class);
+
+    when(configService.findRelease(someAppId, someClusterName, someNamespaceName))
+        .thenReturn(someRelease);
+    when(someRelease.getId()).thenReturn(someServerSideReleaseId);
+
+    ApolloConfig result = configController.queryConfig(someAppId, someClusterName, someNamespaceName,
+        someClientSideReleaseId, someResponse);
+
+    assertNull(result);
+    verify(someResponse, times(1)).setStatus(HttpServletResponse.SC_NOT_MODIFIED);
+    verify(configService, never()).loadConfig(any(Release.class), anyString());
+  }
 }
diff --git a/apollo-core/src/test/java/com/ctrip/apollo/core/AllTests.java b/apollo-core/src/test/java/com/ctrip/apollo/core/AllTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..6d8a0ff9804fa31978030319eaa252e647319a6f
--- /dev/null
+++ b/apollo-core/src/test/java/com/ctrip/apollo/core/AllTests.java
@@ -0,0 +1,11 @@
+package com.ctrip.apollo.core;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({MetaDomainTest.class})
+public class AllTests {
+
+}