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 -N -r1.79.2.3 -r1.79.2.4
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	29 Mar 2019 14:03:03 -0000	1.79.2.3
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	29 Mar 2019 14:15:53 -0000	1.79.2.4
@@ -1421,6 +1421,19 @@
         return $d
     }
 
+    ad_proc -public ::acs::test::confirm_email {
+        -user_id:required
+    } {
+        Confirms user email
+    } {
+        # Call the confirmation URL and check response
+        set token [auth::get_user_secret_token -user_id $user_id]
+        set to_addr [party::get -party_id $user_id -element email]
+        set confirmation_url [export_vars -base "/register/email-confirm" { token user_id }]
+        set d [acs::test::http $confirmation_url]
+        acs::test::reply_has_status_code $d 200
+    }
+
     ad_proc -public ::acs::test::visualize_control_chars {lines} {
         Quotes and therefore makes visible control chars in input lines
     } {
Index: openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl,v
diff -u -N -r1.12.2.3 -r1.12.2.4
--- openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	29 Mar 2019 13:52:10 -0000	1.12.2.3
+++ openacs-4/packages/acs-subsite/tcl/test/acs-subsite-procs.tcl	29 Mar 2019 14:15:53 -0000	1.12.2.4
@@ -327,12 +327,7 @@
                 aa_log "Main subsite does not require email verification"
             }
 
-            # Call the confirmation URL and check response
-            set token [auth::get_user_secret_token -user_id $user_id]
-            set to_addr [party::get -party_id $user_id -element email]
-            set confirmation_url [export_vars -base "/register/email-confirm" { token user_id }]
-            set d [acs::test::http $confirmation_url]
-            acs::test::reply_has_status_code $d 200
+            ::acs::test::confirm_email -user_id $user_id
 
             # Check that email is verified after confirmation
             aa_true "Email is verified" [acs_user::get_user_info \