Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.79.2.34 -r1.79.2.35
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	4 Nov 2020 13:12:15 -0000	1.79.2.34
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	5 Nov 2020 10:14:23 -0000	1.79.2.35
@@ -678,13 +678,6 @@
     }
     set aa_in_init_class ""
 
-    #
-    # Cleanup temporary XOTcl objects
-    #
-    if {[namespace which ::xo::at_cleanup] ne ""} {
-        ::xo::at_cleanup
-    }
-
     # Generate the XML report file
     aa_test::write_test_file
 }
@@ -777,6 +770,13 @@
 
     aa_log_final $aa_testcase_passes $aa_testcase_fails
     unset aa_testcase_id
+
+    #
+    # Cleanup temporary XOTcl objects
+    #
+    if {[namespace which ::xo::at_cleanup] ne ""} {
+        ::xo::at_cleanup
+    }
 }