diff --git a/C4/tests/Record_test.pl b/t/db_dependent/Record/Record.t
similarity index 98%
rename from C4/tests/Record_test.pl
rename to t/db_dependent/Record/Record.t
index f7a65ab0f9..d3f43374a7 100755
--- a/C4/tests/Record_test.pl
+++ b/t/db_dependent/Record/Record.t
@@ -87,9 +87,9 @@ $marcxml_utf8 =~ s/\n//g;
 my $error; my $marc; my $marcxml; my $dcxml; # some scalars to store values
 ## MARC to MARCXML
 print "\n1. Checking conversion of simple ISO-2709 (MARC21) records to MARCXML\n";
-ok (($error,$marcxml) = marc2marcxml($marc21_marc8,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 (MARC21)'); 
+ok (($error,$marcxml) = marc2marcxml($marc21_marc8,'UTF-8','MARC21'), 'marc2marcxml - from MARC-8 to UTF-8 (MARC21)');
 ok (!$error, 'no errors in conversion');
-	$marcxml =~ s/\n//g; 
+	$marcxml =~ s/\n//g;
 	$marcxml =~ s/v\/ s/v\/s/g; # FIXME: bug in new_from_xml_record!!
 is ($marcxml,$marcxml_utf8, 'record matches antitype');
 
diff --git a/C4/tests/testrecords/marc21_marc8.dat b/t/db_dependent/Record/testrecords/marc21_marc8.dat
similarity index 100%
rename from C4/tests/testrecords/marc21_marc8.dat
rename to t/db_dependent/Record/testrecords/marc21_marc8.dat
diff --git a/C4/tests/testrecords/marc21_marc8_combining_chars.dat b/t/db_dependent/Record/testrecords/marc21_marc8_combining_chars.dat
similarity index 100%
rename from C4/tests/testrecords/marc21_marc8_combining_chars.dat
rename to t/db_dependent/Record/testrecords/marc21_marc8_combining_chars.dat
diff --git a/C4/tests/testrecords/marc21_marc8_errors.dat b/t/db_dependent/Record/testrecords/marc21_marc8_errors.dat
similarity index 100%
rename from C4/tests/testrecords/marc21_marc8_errors.dat
rename to t/db_dependent/Record/testrecords/marc21_marc8_errors.dat
diff --git a/C4/tests/testrecords/marc21_utf8.dat b/t/db_dependent/Record/testrecords/marc21_utf8.dat
similarity index 100%
rename from C4/tests/testrecords/marc21_utf8.dat
rename to t/db_dependent/Record/testrecords/marc21_utf8.dat
diff --git a/C4/tests/testrecords/marc21_utf8_combining_chars.dat b/t/db_dependent/Record/testrecords/marc21_utf8_combining_chars.dat
similarity index 100%
rename from C4/tests/testrecords/marc21_utf8_combining_chars.dat
rename to t/db_dependent/Record/testrecords/marc21_utf8_combining_chars.dat
diff --git a/C4/tests/testrecords/marcxml_utf8.xml b/t/db_dependent/Record/testrecords/marcxml_utf8.xml
similarity index 100%
rename from C4/tests/testrecords/marcxml_utf8.xml
rename to t/db_dependent/Record/testrecords/marcxml_utf8.xml
diff --git a/C4/tests/testrecords/marcxml_utf8_entityencoded.xml b/t/db_dependent/Record/testrecords/marcxml_utf8_entityencoded.xml
similarity index 100%
rename from C4/tests/testrecords/marcxml_utf8_entityencoded.xml
rename to t/db_dependent/Record/testrecords/marcxml_utf8_entityencoded.xml