diff --git a/hetu-metastore/src/test/java/io/hetu/core/metastore/TestHetuMetastoreGlobalCache.java b/hetu-metastore/src/test/java/io/hetu/core/metastore/TestHetuMetastoreGlobalCache.java
index 3e16e7c9d..7359ccf72 100644
--- a/hetu-metastore/src/test/java/io/hetu/core/metastore/TestHetuMetastoreGlobalCache.java
+++ b/hetu-metastore/src/test/java/io/hetu/core/metastore/TestHetuMetastoreGlobalCache.java
@@ -70,6 +70,7 @@ import static io.hetu.core.statestore.hazelcast.HazelcastConstants.DISCOVERY_POR
 import static io.prestosql.spi.metastore.HetuErrorCode.HETU_METASTORE_CODE;
 import static io.prestosql.statestore.StateStoreConstants.STATE_STORE_CONFIGURATION_PATH;
 import static java.util.Collections.emptyMap;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
@@ -135,7 +136,7 @@ public class TestHetuMetastoreGlobalCache
         seeds.add(mockSeed);
 
         SeedStoreManager mockSeedStoreManager = mock(SeedStoreManager.class);
-        when(mockSeedStoreManager.getSeedStore(SeedStoreSubType.HAZELCAST)).thenReturn(mockSeedStore);
+        when(mockSeedStoreManager.getSeedStore(any(SeedStoreSubType.class))).thenReturn(mockSeedStore);
 
         when(mockSeed.getLocation()).thenReturn(LOCALHOST + ":" + PORT3);
         when(mockSeedStore.get()).thenReturn(seeds);
diff --git a/presto-main/src/test/java/io/prestosql/seedstore/TestSeedStoreManager.java b/presto-main/src/test/java/io/prestosql/seedstore/TestSeedStoreManager.java
index c629c8ade..aeb2c2529 100644
--- a/presto-main/src/test/java/io/prestosql/seedstore/TestSeedStoreManager.java
+++ b/presto-main/src/test/java/io/prestosql/seedstore/TestSeedStoreManager.java
@@ -92,7 +92,7 @@ public class TestSeedStoreManager
         SeedStoreFactory mockSeedStoreFactory = mock(SeedStoreFactory.class);
         when(mockSeedStoreFactory.getName()).thenReturn("filebased");
         when(mockSeedStoreFactory.create(any(String.class),
-                SeedStoreSubType.HAZELCAST,
+                any(SeedStoreSubType.class),
                 any(HetuFileSystemClient.class),
                 any(Map.class))).thenReturn(mockSeedStore);
         seedStoreManager.addSeedStoreFactory(mockSeedStoreFactory);