diff --git a/gate/post_test_hook.sh b/gate/post_test_hook.sh
index c56e15569..b27274b04 100755
--- a/gate/post_test_hook.sh
+++ b/gate/post_test_hook.sh
@@ -19,7 +19,7 @@ function archive_deleted_rows {
 }
 
 function purge_db {
-    $MANAGE $* db purge --all --verbose
+    $MANAGE db purge --all --verbose --all-cells
     RET=$?
     if [[ $RET -eq 0 ]]; then
         echo Purge successful
@@ -40,7 +40,7 @@ cell_conf=$(conductor_conf 1)
 conf="--config-file $NOVA_CONF --config-file $cell_conf"
 
 archive_deleted_rows $conf
-purge_db $conf
+purge_db
 
 set -e
 # We need to get the admin credentials to run the OSC CLIs for Placement.
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 54b28013c..5c9388da8 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -5926,8 +5926,8 @@ def _purgeable_tables(metadata):
                 t.name.endswith('migrate_version'))]
 
 
-def purge_shadow_tables(before_date, status_fn=None):
-    engine = get_engine()
+def purge_shadow_tables(context, before_date, status_fn=None):
+    engine = get_engine(context=context)
     conn = engine.connect()
     metadata = MetaData()
     metadata.bind = engine