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.53 -r1.79.2.54
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	3 Aug 2021 19:10:16 -0000	1.79.2.53
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	7 Sep 2021 14:52:23 -0000	1.79.2.54
@@ -1030,13 +1030,13 @@
     }
 
     # Testing
-    set setup_error_p [catch {uplevel $test_code} setup_error]
+    set setup_error_p [catch {uplevel 1 $test_code} setup_error]
     set setup_error_stack $::errorInfo
 
     # Teardown
     set teardown_error_p 0
     if { $teardown_code ne "" } {
-        set teardown_error_p [catch {uplevel $teardown_code} teardown_error]
+        set teardown_error_p [catch {uplevel 1 $teardown_code} teardown_error]
         set teardown_error_stack $::errorInfo
     }
 
@@ -1604,7 +1604,7 @@
         upvar $var root
         dom parse -html $html doc
         $doc documentElement root
-        uplevel $body
+        uplevel 1 $body
     }
 
     ad_proc -public get_form {body xpath} {
@@ -1838,7 +1838,7 @@
         # environment
         #
         if {$node eq ""} {
-            set node [uplevel {set root}]
+            set node [uplevel 1 {set root}]
         }
         foreach q $selectors {
             try {