diff --git a/t/db_dependent/Koha/ERM/EUsage/CounterFile.t b/t/db_dependent/Koha/ERM/EUsage/COUNTER_5/CounterFile.t
similarity index 99%
rename from t/db_dependent/Koha/ERM/EUsage/CounterFile.t
rename to t/db_dependent/Koha/ERM/EUsage/COUNTER_5/CounterFile.t
index f4ab82f16b..b06c2143f4 100755
--- a/t/db_dependent/Koha/ERM/EUsage/CounterFile.t
+++ b/t/db_dependent/Koha/ERM/EUsage/COUNTER_5/CounterFile.t
@@ -36,7 +36,7 @@ my $builder = t::lib::TestBuilder->new;
 
 my $patron = $builder->build_object( { class => 'Koha::Patrons' } );
 
-my $sushi_response_file_TR_J1      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_J1.json";
+my $sushi_response_file_TR_J1      = dirname(__FILE__) . "/../../../../data/erm/eusage/COUNTER_5/TR_J1.json";
 my $sushi_counter_5_response_TR_J1 = read_file($sushi_response_file_TR_J1);
 my $sushi_counter_report_TR_J1 =
     Koha::ERM::EUsage::SushiCounter->new( { response => decode_json($sushi_counter_5_response_TR_J1) } );
diff --git a/t/db_dependent/Koha/ERM/EUsage/SushiCounter.t b/t/db_dependent/Koha/ERM/EUsage/COUNTER_5/SushiCounter.t
similarity index 98%
rename from t/db_dependent/Koha/ERM/EUsage/SushiCounter.t
rename to t/db_dependent/Koha/ERM/EUsage/COUNTER_5/SushiCounter.t
index 641dd5f4f1..af1c0ddad6 100755
--- a/t/db_dependent/Koha/ERM/EUsage/SushiCounter.t
+++ b/t/db_dependent/Koha/ERM/EUsage/COUNTER_5/SushiCounter.t
@@ -31,7 +31,8 @@ use t::lib::TestBuilder;
 my $schema  = Koha::Database->new->schema;
 my $builder = t::lib::TestBuilder->new;
 
-my $sushi_response_file_TR_J1      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_J1.json";
+my $test_data_base_dir             = "/../../../../data/erm/eusage/COUNTER_5";
+my $sushi_response_file_TR_J1      = dirname(__FILE__) . $test_data_base_dir . "/TR_J1.json";
 my $sushi_counter_5_response_TR_J1 = decode_json( read_file($sushi_response_file_TR_J1) );
 my $sushi_counter_TR_J1 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_J1 } );
 
@@ -177,7 +178,7 @@ subtest 'TR_J1 _COUNTER_report_body' => sub {
     );
 };
 
-my $sushi_response_file_TR_J2      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_J2.json";
+my $sushi_response_file_TR_J2      = dirname(__FILE__) . $test_data_base_dir . "/TR_J2.json";
 my $sushi_counter_5_response_TR_J2 = decode_json( read_file($sushi_response_file_TR_J2) );
 my $sushi_counter_TR_J2 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_J2 } );
 
@@ -316,7 +317,7 @@ subtest 'TR_J2 _COUNTER_report_body' => sub {
     );
 };
 
-my $sushi_response_file_TR_J3      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_J3.json";
+my $sushi_response_file_TR_J3      = dirname(__FILE__) . $test_data_base_dir . "/TR_J3.json";
 my $sushi_counter_5_response_TR_J3 = decode_json( read_file($sushi_response_file_TR_J3) );
 my $sushi_counter_TR_J3 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_J3 } );
 
@@ -469,7 +470,7 @@ subtest 'TR_J3 _COUNTER_report_body' => sub {
     );
 };
 
-my $sushi_response_file_TR_J4      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_J4.json";
+my $sushi_response_file_TR_J4      = dirname(__FILE__) . $test_data_base_dir . "/TR_J4.json";
 my $sushi_counter_5_response_TR_J4 = decode_json( read_file($sushi_response_file_TR_J4) );
 my $sushi_counter_TR_J4 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_J4 } );
 
@@ -622,7 +623,7 @@ subtest 'TR_J4 _COUNTER_report_body' => sub {
     );
 };
 
-my $sushi_response_file_TR_B3      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_B3.json";
+my $sushi_response_file_TR_B3      = dirname(__FILE__) . $test_data_base_dir . "/TR_B3.json";
 my $sushi_counter_5_response_TR_B3 = decode_json( read_file($sushi_response_file_TR_B3) );
 my $sushi_counter_TR_B3 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_B3 } );
 
@@ -830,7 +831,7 @@ subtest 'TR_B3 _COUNTER_report_body' => sub {
     );
 };
 
-my $sushi_response_file_TR_B2      = dirname(__FILE__) . "/../../../data/erm/eusage/TR_B2.json";
+my $sushi_response_file_TR_B2      = dirname(__FILE__) . $test_data_base_dir . "/TR_B2.json";
 my $sushi_counter_5_response_TR_B2 = decode_json( read_file($sushi_response_file_TR_B2) );
 my $sushi_counter_TR_B2 = Koha::ERM::EUsage::SushiCounter->new( { response => $sushi_counter_5_response_TR_B2 } );
 
diff --git a/t/db_dependent/data/erm/eusage/TR_B2.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_B2.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_B2.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_B2.json
diff --git a/t/db_dependent/data/erm/eusage/TR_B3.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_B3.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_B3.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_B3.json
diff --git a/t/db_dependent/data/erm/eusage/TR_J1.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_J1.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_J1.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_J1.json
diff --git a/t/db_dependent/data/erm/eusage/TR_J2.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_J2.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_J2.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_J2.json
diff --git a/t/db_dependent/data/erm/eusage/TR_J3.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_J3.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_J3.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_J3.json
diff --git a/t/db_dependent/data/erm/eusage/TR_J4.json b/t/db_dependent/data/erm/eusage/COUNTER_5/TR_J4.json
similarity index 100%
rename from t/db_dependent/data/erm/eusage/TR_J4.json
rename to t/db_dependent/data/erm/eusage/COUNTER_5/TR_J4.json