test: Remove sequence number prefixes from test case filenames

This stops the madness of having to invent sequence numbers to be able
to order the test suite run. Instead we now honour the order of the
arguments passed to the runner.

83 files changed, 111 insertions, 110 deletions

diff --git a/Makefile.am b/Makefile.am
index 31e3e771b..3eb2edb99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,12 +130,12 @@ coverage-clean:
 endif
 
 test_cases = \
-	test/000_pod.t \
-	test/100_critic.t \
+	test/pod.t \
+	test/critic.t \
 	$(nil)
 
 test_data = \
-	test/100_critic/perlcriticrc \
+	test/critic/perlcriticrc \
 	$(nil)
 
 include $(top_srcdir)/check.am
diff --git a/debian/changelog b/debian/changelog
index 232ecf0d6..a8a0e501e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.17.7) UNRELEASED; urgency=low
   * Perl test suite cleanup:
     - Switch test suite runner from ExtUtils::Command::MM to Test::Harness.
     - Enable colors in test suite runner.
+    - Remove sequence number prefixes from test case filenames.
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f784ec9bc..d1b93186d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -185,99 +185,99 @@ TEST_COVERAGE = $(PERL_COVERAGE)
 test_tmpdir = t.tmp
 
 test_cases = \
-	t/100_Dpkg_Version.t \
-	t/110_Dpkg_Arch.t \
-	t/150_Dpkg_Package.t \
-	t/190_Dpkg_Shlibs_Cppfilt.t \
-	t/200_Dpkg_Shlibs.t \
-	t/300_Dpkg_BuildOptions.t \
-	t/400_Dpkg_Deps.t \
-	t/500_Dpkg_Path.t \
-	t/550_Dpkg_Util.t \
-	t/600_Dpkg_Changelog.t \
-	t/600_Dpkg_Changelog_Ubuntu.t \
-	t/700_Dpkg_Control.t \
-	t/750_Dpkg_Substvars.t \
-	t/800_Dpkg_IPC.t \
-	t/850_Dpkg_Compression.t \
-	t/910_merge_changelogs.t
+	t/Dpkg_Version.t \
+	t/Dpkg_Arch.t \
+	t/Dpkg_Package.t \
+	t/Dpkg_Shlibs_Cppfilt.t \
+	t/Dpkg_Shlibs.t \
+	t/Dpkg_BuildOptions.t \
+	t/Dpkg_Deps.t \
+	t/Dpkg_Path.t \
+	t/Dpkg_Util.t \
+	t/Dpkg_Changelog.t \
+	t/Dpkg_Changelog_Ubuntu.t \
+	t/Dpkg_Control.t \
+	t/Dpkg_Substvars.t \
+	t/Dpkg_IPC.t \
+	t/Dpkg_Compression.t \
+	t/merge_changelogs.t
 
 test_data = \
-	t/200_Dpkg_Shlibs/symbols.blacklisted \
-	t/200_Dpkg_Shlibs/symbols.blacklist-groups \
-	t/200_Dpkg_Shlibs/symbols.blacklist-filter \
-	t/200_Dpkg_Shlibs/symbols.blacklist-ignore \
-	t/200_Dpkg_Shlibs/symbols.fake-1 \
-	t/200_Dpkg_Shlibs/symbols.fake-2 \
-	t/200_Dpkg_Shlibs/symbols.fake-3 \
-	t/200_Dpkg_Shlibs/symbols.include-1 \
-	t/200_Dpkg_Shlibs/symbols.include-2 \
-	t/200_Dpkg_Shlibs/symbols.include-3 \
-	t/200_Dpkg_Shlibs/basictags.symbols \
-	t/200_Dpkg_Shlibs/basictags.c \
-	t/200_Dpkg_Shlibs/patterns.symbols \
-	t/200_Dpkg_Shlibs/patterns.cpp \
-	t/200_Dpkg_Shlibs/patterns.map \
-	t/200_Dpkg_Shlibs/ld.so.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf_2 \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
-	t/200_Dpkg_Shlibs/objdump.space \
-	t/200_Dpkg_Shlibs/objdump.basictags-amd64 \
-	t/200_Dpkg_Shlibs/objdump.basictags-i386 \
-	t/200_Dpkg_Shlibs/objdump.blacklisted \
-	t/200_Dpkg_Shlibs/objdump.patterns \
-	t/200_Dpkg_Shlibs/objdump.glib-ia64 \
-	t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
-	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
-	t/200_Dpkg_Shlibs/objdump.dbd-pg \
-	t/200_Dpkg_Shlibs/objdump.ls \
-	t/600_Dpkg_Changelog/countme \
-	t/600_Dpkg_Changelog/fields \
-	t/600_Dpkg_Changelog/misplaced-tz \
-	t/600_Dpkg_Changelog/regressions \
-	t/600_Dpkg_Changelog/shadow \
-	t/700_Dpkg_Control/control-1 \
-	t/700_Dpkg_Control/bogus-unsigned.dsc \
-	t/700_Dpkg_Control/bogus-armor-double.dsc \
-	t/700_Dpkg_Control/bogus-armor-no-sig.dsc \
-	t/700_Dpkg_Control/bogus-armor-trail.dsc \
-	t/700_Dpkg_Control/bogus-armor-inline.dsc \
-	t/700_Dpkg_Control/bogus-armor-nested.dsc \
-	t/700_Dpkg_Control/bogus-armor-spaces.dsc \
-	t/750_Dpkg_Substvars/substvars1 \
-	t/910_merge_changelogs/ch-old \
-	t/910_merge_changelogs/ch-a \
-	t/910_merge_changelogs/ch-b \
-	t/910_merge_changelogs/ch-badver-a \
-	t/910_merge_changelogs/ch-badver-b \
-	t/910_merge_changelogs/ch-badver-merged \
-	t/910_merge_changelogs/ch-badver-old \
-	t/910_merge_changelogs/ch-merged \
-	t/910_merge_changelogs/ch-merged-basic \
-	t/910_merge_changelogs/ch-merged-pr \
-	t/910_merge_changelogs/ch-merged-pr-basic \
+	t/Dpkg_Shlibs/symbols.blacklisted \
+	t/Dpkg_Shlibs/symbols.blacklist-groups \
+	t/Dpkg_Shlibs/symbols.blacklist-filter \
+	t/Dpkg_Shlibs/symbols.blacklist-ignore \
+	t/Dpkg_Shlibs/symbols.fake-1 \
+	t/Dpkg_Shlibs/symbols.fake-2 \
+	t/Dpkg_Shlibs/symbols.fake-3 \
+	t/Dpkg_Shlibs/symbols.include-1 \
+	t/Dpkg_Shlibs/symbols.include-2 \
+	t/Dpkg_Shlibs/symbols.include-3 \
+	t/Dpkg_Shlibs/basictags.symbols \
+	t/Dpkg_Shlibs/basictags.c \
+	t/Dpkg_Shlibs/patterns.symbols \
+	t/Dpkg_Shlibs/patterns.cpp \
+	t/Dpkg_Shlibs/patterns.map \
+	t/Dpkg_Shlibs/ld.so.conf \
+	t/Dpkg_Shlibs/ld.so.conf_2 \
+	t/Dpkg_Shlibs/ld.so.conf.d/normal.conf \
+	t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
+	t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
+	t/Dpkg_Shlibs/objdump.space \
+	t/Dpkg_Shlibs/objdump.basictags-amd64 \
+	t/Dpkg_Shlibs/objdump.basictags-i386 \
+	t/Dpkg_Shlibs/objdump.blacklisted \
+	t/Dpkg_Shlibs/objdump.patterns \
+	t/Dpkg_Shlibs/objdump.glib-ia64 \
+	t/Dpkg_Shlibs/objdump.libc6-2.3 \
+	t/Dpkg_Shlibs/objdump.libc6-2.6 \
+	t/Dpkg_Shlibs/objdump.dbd-pg \
+	t/Dpkg_Shlibs/objdump.ls \
+	t/Dpkg_Changelog/countme \
+	t/Dpkg_Changelog/fields \
+	t/Dpkg_Changelog/misplaced-tz \
+	t/Dpkg_Changelog/regressions \
+	t/Dpkg_Changelog/shadow \
+	t/Dpkg_Control/control-1 \
+	t/Dpkg_Control/bogus-unsigned.dsc \
+	t/Dpkg_Control/bogus-armor-double.dsc \
+	t/Dpkg_Control/bogus-armor-no-sig.dsc \
+	t/Dpkg_Control/bogus-armor-trail.dsc \
+	t/Dpkg_Control/bogus-armor-inline.dsc \
+	t/Dpkg_Control/bogus-armor-nested.dsc \
+	t/Dpkg_Control/bogus-armor-spaces.dsc \
+	t/Dpkg_Substvars/substvars1 \
+	t/merge_changelogs/ch-old \
+	t/merge_changelogs/ch-a \
+	t/merge_changelogs/ch-b \
+	t/merge_changelogs/ch-badver-a \
+	t/merge_changelogs/ch-badver-b \
+	t/merge_changelogs/ch-badver-merged \
+	t/merge_changelogs/ch-badver-old \
+	t/merge_changelogs/ch-merged \
+	t/merge_changelogs/ch-merged-basic \
+	t/merge_changelogs/ch-merged-pr \
+	t/merge_changelogs/ch-merged-pr-basic \
 	t/origins/debian \
 	t/origins/default \
 	t/origins/ubuntu
 
 test_data_objects = \
-	t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so \
-	t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so \
-	t/200_Dpkg_Shlibs/libobjdump.patterns.so
+	t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
+	t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
+	t/Dpkg_Shlibs/libobjdump.patterns.so
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/200_Dpkg_Shlibs/basictags.c
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -DAMD64 -o $@
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so: $(srcdir)/t/200_Dpkg_Shlibs/basictags.c
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-i386.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -o $@
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/200_Dpkg_Shlibs/patterns.cpp $(srcdir)/t/200_Dpkg_Shlibs/patterns.map
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/Dpkg_Shlibs/patterns.cpp $(srcdir)/t/Dpkg_Shlibs/patterns.map
 	$(CXX) $(CXXFLAGS) -shared -fPIC -Wl,-soname -Wl,libpatterns.so.1 \
-	    -Wl,--version-script=$(srcdir)/t/200_Dpkg_Shlibs/patterns.map $< \
+	    -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/patterns.map $< \
 	    -o $@
 
 .PHONY: refresh-test-data
@@ -285,13 +285,13 @@ $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/200_Dpkg_Shlibs/
 OBJDUMP = objdump -w -f -p -T -R
 
 refresh-test-data: $(test_data_objects)
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.basictags-amd64
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.basictags-i386
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.patterns
-	$(OBJDUMP) `which ls` >$(srcdir)/t/200_Dpkg_Shlibs/objdump.ls
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.basictags-amd64
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.basictags-i386
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.patterns.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.patterns
+	$(OBJDUMP) `which ls` >$(srcdir)/t/Dpkg_Shlibs/objdump.ls
 
 include $(top_srcdir)/check.am
 
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
deleted file mode 100644
index a8e88c0c2..000000000
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
+++ /dev/null
@@ -1 +0,0 @@
-include t/200_Dpkg_Shlibs/ld.so.conf
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
deleted file mode 100644
index 8e6fe25f4..000000000
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
+++ /dev/null
@@ -1 +0,0 @@
-include t/200_Dpkg_Shlibs/ld.so.conf_2
diff --git a/scripts/t/110_Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 91759ec0e..91759ec0e 100644
--- a/scripts/t/110_Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
diff --git a/scripts/t/300_Dpkg_BuildOptions.t b/scripts/t/Dpkg_BuildOptions.t
index d8b8ff348..d8b8ff348 100644
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/Dpkg_BuildOptions.t
diff --git a/scripts/t/600_Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index a4c0cf361..43bcceaed 100644
--- a/scripts/t/600_Dpkg_Changelog.t
+++ b/scripts/t/Dpkg_Changelog.t
@@ -28,7 +28,7 @@ BEGIN {
 };
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/600_Dpkg_Changelog';
+my $datadir = $srcdir . '/t/Dpkg_Changelog';
 
 my $vendor = get_current_vendor();
 
diff --git a/scripts/t/600_Dpkg_Changelog/countme b/scripts/t/Dpkg_Changelog/countme
index 166b72f42..166b72f42 100644
--- a/scripts/t/600_Dpkg_Changelog/countme
+++ b/scripts/t/Dpkg_Changelog/countme
diff --git a/scripts/t/600_Dpkg_Changelog/fields b/scripts/t/Dpkg_Changelog/fields
index df4638fcd..df4638fcd 100644
--- a/scripts/t/600_Dpkg_Changelog/fields
+++ b/scripts/t/Dpkg_Changelog/fields
diff --git a/scripts/t/600_Dpkg_Changelog/misplaced-tz b/scripts/t/Dpkg_Changelog/misplaced-tz
index 39dc8e377..39dc8e377 100644
--- a/scripts/t/600_Dpkg_Changelog/misplaced-tz
+++ b/scripts/t/Dpkg_Changelog/misplaced-tz
diff --git a/scripts/t/600_Dpkg_Changelog/regressions b/scripts/t/Dpkg_Changelog/regressions
index 4c8ad308a..4c8ad308a 100644
--- a/scripts/t/600_Dpkg_Changelog/regressions
+++ b/scripts/t/Dpkg_Changelog/regressions
diff --git a/scripts/t/600_Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow
index f212bc6db..f212bc6db 100644
--- a/scripts/t/600_Dpkg_Changelog/shadow
+++ b/scripts/t/Dpkg_Changelog/shadow
diff --git a/scripts/t/600_Dpkg_Changelog_Ubuntu.t b/scripts/t/Dpkg_Changelog_Ubuntu.t
index 9dc265947..b2e3783b1 100644
--- a/scripts/t/600_Dpkg_Changelog_Ubuntu.t
+++ b/scripts/t/Dpkg_Changelog_Ubuntu.t
@@ -18,4 +18,4 @@ use warnings;
 
 $ENV{DEB_VENDOR} = 'Ubuntu';
 my $srcdir = $ENV{srcdir} || '.';
-do "$srcdir/t/600_Dpkg_Changelog.t";
+do "$srcdir/t/Dpkg_Changelog.t";
diff --git a/scripts/t/850_Dpkg_Compression.t b/scripts/t/Dpkg_Compression.t
index d81ceb862..bd9b9cb2a 100644
--- a/scripts/t/850_Dpkg_Compression.t
+++ b/scripts/t/Dpkg_Compression.t
@@ -21,7 +21,7 @@ use Test::More tests => 13;
 use_ok('Dpkg::Compression');
 use_ok('Dpkg::Compression::FileHandle');
 
-my $tmpdir = 't.tmp/850_Dpkg_Compression';
+my $tmpdir = 't.tmp/Dpkg_Compression';
 mkdir $tmpdir;
 my @lines = ("One\n", "Two\n", "Three\n");
 my $fh;
diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/Dpkg_Control.t
index 5f6552620..8668b56a9 100644
--- a/scripts/t/700_Dpkg_Control.t
+++ b/scripts/t/Dpkg_Control.t
@@ -25,7 +25,7 @@ BEGIN {
 }
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/700_Dpkg_Control';
+my $datadir = $srcdir . '/t/Dpkg_Control';
 
 sub parse_dsc {
     my ($path) = @_;
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-double.dsc b/scripts/t/Dpkg_Control/bogus-armor-double.dsc
index 1888a00ba..1888a00ba 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-double.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-double.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-inline.dsc b/scripts/t/Dpkg_Control/bogus-armor-inline.dsc
index 44942c1d5..44942c1d5 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-inline.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-inline.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-nested.dsc b/scripts/t/Dpkg_Control/bogus-armor-nested.dsc
index ca99c3580..ca99c3580 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-nested.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-nested.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-no-sig.dsc b/scripts/t/Dpkg_Control/bogus-armor-no-sig.dsc
index 4502a185a..4502a185a 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-no-sig.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-no-sig.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-spaces.dsc b/scripts/t/Dpkg_Control/bogus-armor-spaces.dsc
index ab71ab530..ab71ab530 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-spaces.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-spaces.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-armor-trail.dsc b/scripts/t/Dpkg_Control/bogus-armor-trail.dsc
index 90b00f1b0..90b00f1b0 100644
--- a/scripts/t/700_Dpkg_Control/bogus-armor-trail.dsc
+++ b/scripts/t/Dpkg_Control/bogus-armor-trail.dsc
diff --git a/scripts/t/700_Dpkg_Control/bogus-unsigned.dsc b/scripts/t/Dpkg_Control/bogus-unsigned.dsc
index 7573eb301..7573eb301 100644
--- a/scripts/t/700_Dpkg_Control/bogus-unsigned.dsc
+++ b/scripts/t/Dpkg_Control/bogus-unsigned.dsc
diff --git a/scripts/t/700_Dpkg_Control/control-1 b/scripts/t/Dpkg_Control/control-1
index 85bdbb555..85bdbb555 100644
--- a/scripts/t/700_Dpkg_Control/control-1
+++ b/scripts/t/Dpkg_Control/control-1
diff --git a/scripts/t/400_Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t
index 451a028be..451a028be 100644
--- a/scripts/t/400_Dpkg_Deps.t
+++ b/scripts/t/Dpkg_Deps.t
diff --git a/scripts/t/800_Dpkg_IPC.t b/scripts/t/Dpkg_IPC.t
index 3628fda0e..3628fda0e 100644
--- a/scripts/t/800_Dpkg_IPC.t
+++ b/scripts/t/Dpkg_IPC.t
diff --git a/scripts/t/150_Dpkg_Package.t b/scripts/t/Dpkg_Package.t
index 118f28299..118f28299 100644
--- a/scripts/t/150_Dpkg_Package.t
+++ b/scripts/t/Dpkg_Package.t
diff --git a/scripts/t/500_Dpkg_Path.t b/scripts/t/Dpkg_Path.t
index 0e2b685b6..bf0484770 100644
--- a/scripts/t/500_Dpkg_Path.t
+++ b/scripts/t/Dpkg_Path.t
@@ -22,7 +22,7 @@ use_ok('Dpkg::Path', 'canonpath', 'resolve_symlink',
        'check_files_are_the_same', 'get_pkg_root_dir',
        'guess_pkg_root_dir', 'relative_to_pkg_root');
 
-my $tmpdir = 't.tmp/500_Dpkg_Path';
+my $tmpdir = 't.tmp/Dpkg_Path';
 
 mkdir $tmpdir;
 mkdir "$tmpdir/a";
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 6aaa3eaad..d1d265719 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -30,14 +30,14 @@ my @save_paths = Dpkg::Shlibs::get_library_paths();
 Dpkg::Shlibs::reset_library_paths();
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/200_Dpkg_Shlibs';
+my $datadir = $srcdir . '/t/Dpkg_Shlibs';
 
 # We want relative paths inside the ld.so.conf fragments to work, and $srcdir
 # is usually a relative path, so let's temporarily switch directory.
 # XXX: An alternative would be to make parse_ldso_conf relative path aware.
 my $cwd = cwd();
 chdir($srcdir);
-Dpkg::Shlibs::parse_ldso_conf('t/200_Dpkg_Shlibs/ld.so.conf');
+Dpkg::Shlibs::parse_ldso_conf('t/Dpkg_Shlibs/ld.so.conf');
 chdir($cwd);
 
 use Data::Dumper;
diff --git a/scripts/t/200_Dpkg_Shlibs/basictags.c b/scripts/t/Dpkg_Shlibs/basictags.c
index f0a834975..f0a834975 100644
--- a/scripts/t/200_Dpkg_Shlibs/basictags.c
+++ b/scripts/t/Dpkg_Shlibs/basictags.c
diff --git a/scripts/t/200_Dpkg_Shlibs/basictags.symbols b/scripts/t/Dpkg_Shlibs/basictags.symbols
index 6d23413fd..6d23413fd 100644
--- a/scripts/t/200_Dpkg_Shlibs/basictags.symbols
+++ b/scripts/t/Dpkg_Shlibs/basictags.symbols
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf
index cbbf7bd98..7f0a4aafe 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf
@@ -5,5 +5,5 @@
 /nonexistant/lib64
 
 include /nonexistant/*.conf
-include t/200_Dpkg_Shlibs/ld.so.conf.d/*.conf
+include t/Dpkg_Shlibs/ld.so.conf.d/*.conf
 
diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
new file mode 100644
index 000000000..fbb83d899
--- /dev/null
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
@@ -0,0 +1 @@
+include t/Dpkg_Shlibs/ld.so.conf
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/normal.conf
index 26e8b98c1..26e8b98c1 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/normal.conf
diff --git a/scripts/t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf
new file mode 100644
index 000000000..702e41efc
--- /dev/null
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf
@@ -0,0 +1 @@
+include t/Dpkg_Shlibs/ld.so.conf_2
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf_2 b/scripts/t/Dpkg_Shlibs/ld.so.conf_2
index 4a36fea14..4a36fea14 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf_2
+++ b/scripts/t/Dpkg_Shlibs/ld.so.conf_2
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.basictags-amd64 b/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64
index d19561c0c..c56854479 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.basictags-amd64
+++ b/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64
@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.basictags-amd64.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00000410
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.basictags-i386 b/scripts/t/Dpkg_Shlibs/objdump.basictags-i386
index a09b57640..15d2842a5 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.basictags-i386
+++ b/scripts/t/Dpkg_Shlibs/objdump.basictags-i386
@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.basictags-i386.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00000440
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.blacklisted b/scripts/t/Dpkg_Shlibs/objdump.blacklisted
index 2db4e7507..2db4e7507 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.blacklisted
+++ b/scripts/t/Dpkg_Shlibs/objdump.blacklisted
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.dbd-pg b/scripts/t/Dpkg_Shlibs/objdump.dbd-pg
index c515dff86..c515dff86 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.dbd-pg
+++ b/scripts/t/Dpkg_Shlibs/objdump.dbd-pg
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.glib-ia64 b/scripts/t/Dpkg_Shlibs/objdump.glib-ia64
index a3ff4d8be..a3ff4d8be 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.glib-ia64
+++ b/scripts/t/Dpkg_Shlibs/objdump.glib-ia64
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.3 b/scripts/t/Dpkg_Shlibs/objdump.libc6-2.3
index e76105102..e76105102 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.3
+++ b/scripts/t/Dpkg_Shlibs/objdump.libc6-2.3
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.6 b/scripts/t/Dpkg_Shlibs/objdump.libc6-2.6
index ba68d1c9a..ba68d1c9a 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.libc6-2.6
+++ b/scripts/t/Dpkg_Shlibs/objdump.libc6-2.6
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.ls b/scripts/t/Dpkg_Shlibs/objdump.ls
index f679242c3..f679242c3 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.ls
+++ b/scripts/t/Dpkg_Shlibs/objdump.ls
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.patterns b/scripts/t/Dpkg_Shlibs/objdump.patterns
index 775ebfa76..a319cb95f 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.patterns
+++ b/scripts/t/Dpkg_Shlibs/objdump.patterns
@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.patterns.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.patterns.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00001880
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.space b/scripts/t/Dpkg_Shlibs/objdump.space
index 7ef3f9083..7ef3f9083 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.space
+++ b/scripts/t/Dpkg_Shlibs/objdump.space
diff --git a/scripts/t/200_Dpkg_Shlibs/patterns.cpp b/scripts/t/Dpkg_Shlibs/patterns.cpp
index 3beee43e0..3beee43e0 100644
--- a/scripts/t/200_Dpkg_Shlibs/patterns.cpp
+++ b/scripts/t/Dpkg_Shlibs/patterns.cpp
diff --git a/scripts/t/200_Dpkg_Shlibs/patterns.map b/scripts/t/Dpkg_Shlibs/patterns.map
index ace30b721..ace30b721 100644
--- a/scripts/t/200_Dpkg_Shlibs/patterns.map
+++ b/scripts/t/Dpkg_Shlibs/patterns.map
diff --git a/scripts/t/200_Dpkg_Shlibs/patterns.symbols b/scripts/t/Dpkg_Shlibs/patterns.symbols
index bacf799d9..bacf799d9 100644
--- a/scripts/t/200_Dpkg_Shlibs/patterns.symbols
+++ b/scripts/t/Dpkg_Shlibs/patterns.symbols
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-filter b/scripts/t/Dpkg_Shlibs/symbols.blacklist-filter
index f66ab2311..f66ab2311 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-filter
+++ b/scripts/t/Dpkg_Shlibs/symbols.blacklist-filter
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-groups b/scripts/t/Dpkg_Shlibs/symbols.blacklist-groups
index 4d3f270e9..4d3f270e9 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-groups
+++ b/scripts/t/Dpkg_Shlibs/symbols.blacklist-groups
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-ignore b/scripts/t/Dpkg_Shlibs/symbols.blacklist-ignore
index 9879c12dd..9879c12dd 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.blacklist-ignore
+++ b/scripts/t/Dpkg_Shlibs/symbols.blacklist-ignore
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.blacklisted b/scripts/t/Dpkg_Shlibs/symbols.blacklisted
index a6d3dd6ec..a6d3dd6ec 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.blacklisted
+++ b/scripts/t/Dpkg_Shlibs/symbols.blacklisted
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.fake-1 b/scripts/t/Dpkg_Shlibs/symbols.fake-1
index f0a230eb4..f0a230eb4 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.fake-1
+++ b/scripts/t/Dpkg_Shlibs/symbols.fake-1
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.fake-2 b/scripts/t/Dpkg_Shlibs/symbols.fake-2
index 3eed28973..3eed28973 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.fake-2
+++ b/scripts/t/Dpkg_Shlibs/symbols.fake-2
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.fake-3 b/scripts/t/Dpkg_Shlibs/symbols.fake-3
index 576bf22e9..576bf22e9 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.fake-3
+++ b/scripts/t/Dpkg_Shlibs/symbols.fake-3
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.include-1 b/scripts/t/Dpkg_Shlibs/symbols.include-1
index b524e78ef..b524e78ef 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.include-1
+++ b/scripts/t/Dpkg_Shlibs/symbols.include-1
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.include-2 b/scripts/t/Dpkg_Shlibs/symbols.include-2
index 0cc18facb..0cc18facb 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.include-2
+++ b/scripts/t/Dpkg_Shlibs/symbols.include-2
diff --git a/scripts/t/200_Dpkg_Shlibs/symbols.include-3 b/scripts/t/Dpkg_Shlibs/symbols.include-3
index 8c8f42949..8c8f42949 100644
--- a/scripts/t/200_Dpkg_Shlibs/symbols.include-3
+++ b/scripts/t/Dpkg_Shlibs/symbols.include-3
diff --git a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t b/scripts/t/Dpkg_Shlibs_Cppfilt.t
index f021fbdb8..f021fbdb8 100644
--- a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
+++ b/scripts/t/Dpkg_Shlibs_Cppfilt.t
diff --git a/scripts/t/750_Dpkg_Substvars.t b/scripts/t/Dpkg_Substvars.t
index 13397841b..5a9c18313 100644
--- a/scripts/t/750_Dpkg_Substvars.t
+++ b/scripts/t/Dpkg_Substvars.t
@@ -24,7 +24,7 @@ use Dpkg::Arch qw(get_host_arch);
 use_ok('Dpkg::Substvars');
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/750_Dpkg_Substvars';
+my $datadir = $srcdir . '/t/Dpkg_Substvars';
 
 my $s = Dpkg::Substvars->new();
 
@@ -80,7 +80,7 @@ is($s->substvars('This is a string with unknown variable ${blubb}'),
                  'This is a string with unknown variable ',
                  'substvars missing');
 delete $SIG{__WARN__};
-is($output, '750_Dpkg_Substvars.t: warning: unknown substitution variable ${blubb}'."\n"
+is($output, 'Dpkg_Substvars.t: warning: unknown substitution variable ${blubb}'."\n"
           , 'missing variables warning');
 
 # Recursive replace
@@ -99,7 +99,7 @@ $output = '';
 $SIG{__WARN__} = sub { $output .= $_[0] };
 $s->warn_about_unused();
 delete $SIG{__WARN__};
-is($output, "750_Dpkg_Substvars.t: warning: unused substitution variable \${var2}\n",
+is($output, "Dpkg_Substvars.t: warning: unused substitution variable \${var2}\n",
           , 'unused variables warnings');
 
 # Disable warnings for a certain variable
diff --git a/scripts/t/750_Dpkg_Substvars/substvars1 b/scripts/t/Dpkg_Substvars/substvars1
index f71c95361..f71c95361 100644
--- a/scripts/t/750_Dpkg_Substvars/substvars1
+++ b/scripts/t/Dpkg_Substvars/substvars1
diff --git a/scripts/t/550_Dpkg_Util.t b/scripts/t/Dpkg_Util.t
index 03a889845..03a889845 100644
--- a/scripts/t/550_Dpkg_Util.t
+++ b/scripts/t/Dpkg_Util.t
diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/Dpkg_Version.t
index f719accfa..f719accfa 100644
--- a/scripts/t/100_Dpkg_Version.t
+++ b/scripts/t/Dpkg_Version.t
diff --git a/scripts/t/910_merge_changelogs.t b/scripts/t/merge_changelogs.t
index d8e7cb188..5e7b40c62 100644
--- a/scripts/t/910_merge_changelogs.t
+++ b/scripts/t/merge_changelogs.t
@@ -24,7 +24,7 @@ use File::Compare;
 use File::Temp qw(tempfile);
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = "$srcdir/t/910_merge_changelogs";
+my $datadir = "$srcdir/t/merge_changelogs";
 
 my $res;
 sub test_merge {
diff --git a/scripts/t/910_merge_changelogs/ch-a b/scripts/t/merge_changelogs/ch-a
index 02dad9397..02dad9397 100644
--- a/scripts/t/910_merge_changelogs/ch-a
+++ b/scripts/t/merge_changelogs/ch-a
diff --git a/scripts/t/910_merge_changelogs/ch-b b/scripts/t/merge_changelogs/ch-b
index 6ea017852..6ea017852 100644
--- a/scripts/t/910_merge_changelogs/ch-b
+++ b/scripts/t/merge_changelogs/ch-b
diff --git a/scripts/t/910_merge_changelogs/ch-badver-a b/scripts/t/merge_changelogs/ch-badver-a
index d544e64bf..d544e64bf 100644
--- a/scripts/t/910_merge_changelogs/ch-badver-a
+++ b/scripts/t/merge_changelogs/ch-badver-a
diff --git a/scripts/t/910_merge_changelogs/ch-badver-b b/scripts/t/merge_changelogs/ch-badver-b
index 609254edd..609254edd 100644
--- a/scripts/t/910_merge_changelogs/ch-badver-b
+++ b/scripts/t/merge_changelogs/ch-badver-b
diff --git a/scripts/t/910_merge_changelogs/ch-badver-merged b/scripts/t/merge_changelogs/ch-badver-merged
index 609254edd..609254edd 100644
--- a/scripts/t/910_merge_changelogs/ch-badver-merged
+++ b/scripts/t/merge_changelogs/ch-badver-merged
diff --git a/scripts/t/910_merge_changelogs/ch-badver-old b/scripts/t/merge_changelogs/ch-badver-old
index d544e64bf..d544e64bf 100644
--- a/scripts/t/910_merge_changelogs/ch-badver-old
+++ b/scripts/t/merge_changelogs/ch-badver-old
diff --git a/scripts/t/910_merge_changelogs/ch-merged b/scripts/t/merge_changelogs/ch-merged
index e2411ab36..e2411ab36 100644
--- a/scripts/t/910_merge_changelogs/ch-merged
+++ b/scripts/t/merge_changelogs/ch-merged
diff --git a/scripts/t/910_merge_changelogs/ch-merged-basic b/scripts/t/merge_changelogs/ch-merged-basic
index ee5d84352..ee5d84352 100644
--- a/scripts/t/910_merge_changelogs/ch-merged-basic
+++ b/scripts/t/merge_changelogs/ch-merged-basic
diff --git a/scripts/t/910_merge_changelogs/ch-merged-pr b/scripts/t/merge_changelogs/ch-merged-pr
index 862d97785..862d97785 100644
--- a/scripts/t/910_merge_changelogs/ch-merged-pr
+++ b/scripts/t/merge_changelogs/ch-merged-pr
diff --git a/scripts/t/910_merge_changelogs/ch-merged-pr-basic b/scripts/t/merge_changelogs/ch-merged-pr-basic
index 6b85fa694..6b85fa694 100644
--- a/scripts/t/910_merge_changelogs/ch-merged-pr-basic
+++ b/scripts/t/merge_changelogs/ch-merged-pr-basic
diff --git a/scripts/t/910_merge_changelogs/ch-old b/scripts/t/merge_changelogs/ch-old
index 12ee224c1..12ee224c1 100644
--- a/scripts/t/910_merge_changelogs/ch-old
+++ b/scripts/t/merge_changelogs/ch-old
diff --git a/src/Makefile.am b/src/Makefile.am
index e2773aa31..bdfb41700 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -91,7 +91,7 @@ install-data-local:
 test_tmpdir = t.tmp
 
 test_cases = \
-	t/100_dpkg_divert.t
+	t/dpkg_divert.t
 
 include $(top_srcdir)/check.am
 
diff --git a/src/t/100_dpkg_divert.t b/src/t/dpkg_divert.t
index a959bf1de..bdd48d2b9 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/dpkg_divert.t
@@ -27,7 +27,7 @@ delete $ENV{DPKG_MAINTSCRIPT_ARCH};
 
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
-my $tmpdir = 't.tmp/950_dpkg_divert';
+my $tmpdir = 't.tmp/dpkg_divert';
 my $admindir = File::Spec->rel2abs("$tmpdir/admindir");
 my $testdir = File::Spec->rel2abs("$tmpdir/testdir");
 
diff --git a/test/100_critic.t b/test/critic.t
index 09cf1b910..8672f83b2 100644
--- a/test/100_critic.t
+++ b/test/critic.t
@@ -115,7 +115,7 @@ my @policies = qw(
 );
 
 Test::Perl::Critic->import(
-    -profile => 'test/100_critic/perlcriticrc',
+    -profile => 'test/critic/perlcriticrc',
     -verbose => 8,
     -include => \@policies,
     -only => 1,
diff --git a/test/100_critic/perlcriticrc b/test/critic/perlcriticrc
index b627a4ab6..b627a4ab6 100644
--- a/test/100_critic/perlcriticrc
+++ b/test/critic/perlcriticrc
diff --git a/test/000_pod.t b/test/pod.t
index 312105a0c..312105a0c 100644
--- a/test/000_pod.t
+++ b/test/pod.t
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 15df1f9db..13d44cf1a 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -55,7 +55,7 @@ TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)
 
 test_tmpdir = t.tmp
 test_cases = \
-	t/100_update_alternatives.t
+	t/update_alternatives.t
 
 include $(top_srcdir)/check.am
 
diff --git a/utils/t/100_update_alternatives.t b/utils/t/update_alternatives.t
index ca413bef5..7f779a9e9 100644
--- a/utils/t/100_update_alternatives.t
+++ b/utils/t/update_alternatives.t
@@ -22,7 +22,7 @@ use strict;
 use warnings;
 
 my $srcdir = $ENV{srcdir} || '.';
-my $tmpdir = 't.tmp/900_update_alternatives';
+my $tmpdir = 't.tmp/update_alternatives';
 my $admindir = File::Spec->rel2abs("$tmpdir/admindir"),
 my $altdir = File::Spec->rel2abs("$tmpdir/alternatives");
 my $bindir = File::Spec->rel2abs("$tmpdir/bin");