diff --git a/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java b/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
index 1a4410add7ba0..9b5e5f90ac9d6 100644
--- a/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
+++ b/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
@@ -75,17 +75,22 @@ public GraphDatabaseFacade createDatabase( String name )
     }
 
     @Override
-    public synchronized void shutdownDatabase( String name )
+    public synchronized void shutdownDatabase( String ignore )
     {
-        if ( database != null )
-        {
-            database.shutdown();
-        }
+        shutdownDatabase();
     }
 
     @Override
     public void stop()
     {
-        shutdownDatabase( DatabaseManager.DEFAULT_DATABASE_NAME );
+        shutdownDatabase();
+    }
+
+    private void shutdownDatabase()
+    {
+        if ( database != null )
+        {
+            database.shutdown();
+        }
     }
 }
diff --git a/community/neo4j/src/test/java/org/neo4j/dmbs/database/DefaultDatabaseManagerIT.java b/community/neo4j/src/test/java/org/neo4j/dmbs/database/DefaultDatabaseManagerIT.java
index 7562ff1db25ec..9960e4daca1b7 100644
--- a/community/neo4j/src/test/java/org/neo4j/dmbs/database/DefaultDatabaseManagerIT.java
+++ b/community/neo4j/src/test/java/org/neo4j/dmbs/database/DefaultDatabaseManagerIT.java
@@ -19,6 +19,7 @@
  */
 package org.neo4j.dmbs.database;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -34,6 +35,7 @@
 import org.neo4j.test.extension.TestDirectoryExtension;
 import org.neo4j.test.rule.TestDirectory;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -50,6 +52,12 @@ void setUp()
         database = new GraphDatabaseFactory().newEmbeddedDatabase( testDirectory.storeDir() );
     }
 
+    @AfterEach
+    void tearDown()
+    {
+        database.shutdown();
+    }
+
     @Test
     void createDatabase()
     {
@@ -65,6 +73,14 @@ void lookupExistingDatabase()
         assertTrue( database.isPresent() );
     }
 
+    @Test
+    void shutdownDatabaseOnStop() throws Throwable
+    {
+        DatabaseManager databaseManager = getDatabaseManager();
+        databaseManager.stop();
+        assertFalse( database.isAvailable( 0 ) );
+    }
+
     private DatabaseManager getDatabaseManager()
     {
         return ((GraphDatabaseAPI)database).getDependencyResolver().resolveDependency( DatabaseManager.class );