Index: openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl,v
diff -u -r1.1.2.46 -r1.1.2.47
--- openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	3 Mar 2021 17:47:52 -0000	1.1.2.46
+++ openacs-4/packages/xowiki/tcl/test/xowiki-test-procs.tcl	19 Mar 2021 19:35:10 -0000	1.1.2.47
@@ -429,26 +429,20 @@
         #
         # Create a new admin user and login
         #
-        set user_id [db_nextval acs_object_id_seq]
-        set user_info [acs::test::user::create -user_id $user_id -admin]
-        acs::test::confirm_email -user_id $user_id
+       #
+        # Setup of test user_id and login
+        #
+        set user_info [::acs::test::user::create -email xowf@acs-testing.test -admin]
+        set request_info [::acs::test::login $user_info]
 
         set instance /xowiki-test
         set package_id [::acs::test::require_package_instance \
                             -package_key xowiki \
                             -empty \
                             -instance_name $instance]
-
         set testfolder .testfolder
-        try {
-            #
-            # Run one upfront request to obtain the request_info, used
-            # in later cases.
-            #
-            set request_info [acs::test::http -user_info $user_info $instance/]
-            #aa_log "request_info vars: [dict keys $request_info]"
-            #aa_log "request_info session [ns_quotehtml <[dict get $request_info session]>]"
 
+        try {
             ###########################################################
             aa_section "Require test folder"
             ###########################################################
@@ -690,7 +684,6 @@
                 set node_id [site_node::get_element -url $instance -element node_id]
                 site_node::delete -node_id $node_id -delete_package
             }
-            acs::test::user::delete -user_id $user_id
         }
     }
 }