diff --git a/t/db_dependent/api/v1/erm_custom_reports.t b/t/db_dependent/api/v1/erm_custom_reports.t
index fcb7eba1b0..1317c61761 100755
--- a/t/db_dependent/api/v1/erm_custom_reports.t
+++ b/t/db_dependent/api/v1/erm_custom_reports.t
@@ -50,27 +50,6 @@ subtest "monthly_report" => sub {
 
     $schema->storage->txn_begin;
 
-    my $librarian = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 2**28 }
-        }
-    );
-    my $password = 'thePassword123';
-    $librarian->set_password( { password => $password, skip_validation => 1 } );
-    my $userid = $librarian->userid;
-    t::lib::Mocks::mock_userenv( { number => $userid } );
-
-    my $patron = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 0 }
-        }
-    );
-
-    $patron->set_password( { password => $password, skip_validation => 1 } );
-    my $unauth_userid = $patron->userid;
-
     # Run a harvest to populate the database with data
     my $usage_data_provider = $builder->build_object( { class => 'Koha::ERM::EUsage::UsageDataProviders' } );
     my $counter_file        = $sushi_counter_TR_J1->get_COUNTER_from_SUSHI;
@@ -85,6 +64,26 @@ subtest "monthly_report" => sub {
         ]
     );
 
+    my $librarian = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 2**28 }
+        }
+    );
+    my $password = 'thePassword123';
+    $librarian->set_password( { password => $password, skip_validation => 1 } );
+    my $userid = $librarian->userid;
+
+    my $patron = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 0 }
+        }
+    );
+
+    $patron->set_password( { password => $password, skip_validation => 1 } );
+    my $unauth_userid = $patron->userid;
+
     # Unauthorized access
     $t->get_ok("//$unauth_userid:$password@/api/v1/erm/eUsage/monthly_report/title")->status_is(403);
 
@@ -149,27 +148,6 @@ subtest "yearly_report" => sub {
 
     $schema->storage->txn_begin;
 
-    my $librarian = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 2**28 }
-        }
-    );
-    my $password = 'thePassword123';
-    $librarian->set_password( { password => $password, skip_validation => 1 } );
-    my $userid = $librarian->userid;
-    t::lib::Mocks::mock_userenv( { number => $userid } );
-
-    my $patron = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 0 }
-        }
-    );
-
-    $patron->set_password( { password => $password, skip_validation => 1 } );
-    my $unauth_userid = $patron->userid;
-
     # Run a harvest to populate the database with data
     my $usage_data_provider = $builder->build_object( { class => 'Koha::ERM::EUsage::UsageDataProviders' } );
     my $counter_file        = $sushi_counter_TR_J1->get_COUNTER_from_SUSHI;
@@ -184,6 +162,26 @@ subtest "yearly_report" => sub {
         ]
     );
 
+    my $librarian = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 2**28 }
+        }
+    );
+    my $password = 'thePassword123';
+    $librarian->set_password( { password => $password, skip_validation => 1 } );
+    my $userid = $librarian->userid;
+
+    my $patron = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 0 }
+        }
+    );
+
+    $patron->set_password( { password => $password, skip_validation => 1 } );
+    my $unauth_userid = $patron->userid;
+
     # Unauthorized access
     $t->get_ok("//$unauth_userid:$password@/api/v1/erm/eUsage/yearly_report/title")->status_is(403);
 
@@ -239,27 +237,6 @@ subtest "metric_types_report" => sub {
 
     $schema->storage->txn_begin;
 
-    my $librarian = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 2**28 }
-        }
-    );
-    my $password = 'thePassword123';
-    $librarian->set_password( { password => $password, skip_validation => 1 } );
-    my $userid = $librarian->userid;
-    t::lib::Mocks::mock_userenv( { number => $userid } );
-
-    my $patron = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 0 }
-        }
-    );
-
-    $patron->set_password( { password => $password, skip_validation => 1 } );
-    my $unauth_userid = $patron->userid;
-
     # Run a harvest to populate the database with data
     my $usage_data_provider = $builder->build_object( { class => 'Koha::ERM::EUsage::UsageDataProviders' } );
     my $counter_file        = $sushi_counter_TR_J1->get_COUNTER_from_SUSHI;
@@ -274,6 +251,26 @@ subtest "metric_types_report" => sub {
         ]
     );
 
+    my $librarian = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 2**28 }
+        }
+    );
+    my $password = 'thePassword123';
+    $librarian->set_password( { password => $password, skip_validation => 1 } );
+    my $userid = $librarian->userid;
+
+    my $patron = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 0 }
+        }
+    );
+
+    $patron->set_password( { password => $password, skip_validation => 1 } );
+    my $unauth_userid = $patron->userid;
+
     # Unauthorized access
     $t->get_ok("//$unauth_userid:$password@/api/v1/erm/eUsage/metric_types_report/title")->status_is(403);
 
@@ -335,27 +332,6 @@ subtest "provider_rollup_report" => sub {
 
     $schema->storage->txn_begin;
 
-    my $librarian = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 2**28 }
-        }
-    );
-    my $password = 'thePassword123';
-    $librarian->set_password( { password => $password, skip_validation => 1 } );
-    my $userid = $librarian->userid;
-    t::lib::Mocks::mock_userenv( { number => $userid } );
-
-    my $patron = $builder->build_object(
-        {
-            class => 'Koha::Patrons',
-            value => { flags => 0 }
-        }
-    );
-
-    $patron->set_password( { password => $password, skip_validation => 1 } );
-    my $unauth_userid = $patron->userid;
-
     # Run a harvest to populate the database with data
     my $usage_data_provider = $builder->build_object( { class => 'Koha::ERM::EUsage::UsageDataProviders' } );
     my $counter_file        = $sushi_counter_TR_J1->get_COUNTER_from_SUSHI;
@@ -370,6 +346,26 @@ subtest "provider_rollup_report" => sub {
         ]
     );
 
+    my $librarian = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 2**28 }
+        }
+    );
+    my $password = 'thePassword123';
+    $librarian->set_password( { password => $password, skip_validation => 1 } );
+    my $userid = $librarian->userid;
+
+    my $patron = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => { flags => 0 }
+        }
+    );
+
+    $patron->set_password( { password => $password, skip_validation => 1 } );
+    my $unauth_userid = $patron->userid;
+
     # Unauthorized access
     $t->get_ok("//$unauth_userid:$password@/api/v1/erm/eUsage/provider_rollup_report/title")->status_is(403);