diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/LocalClusterStateTest.java b/src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/LocalClusterStateTest.java
index 0c1859eeca..5528468fd8 100644
--- a/src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/LocalClusterStateTest.java
+++ b/src/test/java/com/amazon/opendistroforelasticsearch/sql/unittest/LocalClusterStateTest.java
@@ -122,12 +122,8 @@ public class LocalClusterStateTest {
 
     @Before
     public void init() {
-        mockLocalClusterState(MAPPING);
-    }
-
-    @After
-    public void cleanUp() {
         LocalClusterState.state(null);
+        mockLocalClusterState(MAPPING);
     }
 
     @Test