diff --git a/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/server/VeniceServerTest.java b/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/server/VeniceServerTest.java
index d278006dba..d3dd4cc205 100644
--- a/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/server/VeniceServerTest.java
+++ b/internal/venice-test-common/src/integrationTest/java/com/linkedin/venice/server/VeniceServerTest.java
@@ -203,15 +203,12 @@ public void testStartServerAndShutdownWithPartitionAssignmentVerification() {
       Assert.assertTrue(server.getVeniceServer().getHelixParticipationService().isRunning());
       Assert.assertEquals(storageService.getStorageEngine(storeName).getPartitionIds().size(), 3);
 
-      server.getVeniceServer().shutdown();
-
       cluster.stopVeniceServer(server.getPort());
+      cluster.getControllerClient().deleteStore(storeName);
       cluster.restartVeniceServer(server.getPort());
       repository = server.getVeniceServer().getStorageService().getStorageEngineRepository();
       Assert.assertEquals(repository.getAllLocalStorageEngines().size(), 1);
       Assert.assertEquals(storageService.getStorageEngine(storeName).getPartitionIds().size(), 0);
-
-      cluster.getControllerClient().deleteStore(storeName);
     }
   }