diff --git a/list/src/org/labkey/list/model/ListManager.java b/list/src/org/labkey/list/model/ListManager.java
index 557eeae8e0a..9637309e819 100644
--- a/list/src/org/labkey/list/model/ListManager.java
+++ b/list/src/org/labkey/list/model/ListManager.java
@@ -1383,11 +1383,12 @@ private static int addListItem(Container scopedContainer, ListDefinition scopedL
         @AfterClass
         public static void cleanup()
         {
-            deleteTestContainer();
-
+            list = null;
             dp = null;
             c = null;
             u = null;
+
+            deleteTestContainer();
         }
 
         private static void deleteTestContainer()