diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php
index 83100f3..f0de3db 100644
--- a/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/core/modules/config/src/Tests/ConfigImportAllTest.php
@@ -76,7 +76,10 @@ public function testInstallUninstall() {
 
     $fields = \Drupal::entityManager()->getStorage('field_config')->loadMultiple();
     \Drupal::entityManager()->getStorage('field_config')->delete($fields);
-    // Purge the data.
+    // Purge the data. Need to call this twice to actually remove all the
+    // fields. First time around will purge the instances. Second time will
+    // delete the instances and fields.
+    field_purge_batch(1000);
     field_purge_batch(1000);
 
     system_list_reset();