diff --git a/test/t-exim/config/chasquid.conf b/test/t-01-simple_local/config/chasquid.conf
similarity index 100%
rename from test/t-exim/config/chasquid.conf
rename to test/t-01-simple_local/config/chasquid.conf
diff --git a/test/t-exim/config/domains/srv-chasquid/users b/test/t-01-simple_local/config/domains/testserver/users
similarity index 100%
rename from test/t-exim/config/domains/srv-chasquid/users
rename to test/t-01-simple_local/config/domains/testserver/users
diff --git a/test/t-exim/content b/test/t-01-simple_local/content
similarity index 100%
rename from test/t-exim/content
rename to test/t-01-simple_local/content
diff --git a/test/t-simple_local/hosts b/test/t-01-simple_local/hosts
similarity index 100%
rename from test/t-simple_local/hosts
rename to test/t-01-simple_local/hosts
diff --git a/test/t-simple_local/msmtprc b/test/t-01-simple_local/msmtprc
similarity index 100%
rename from test/t-simple_local/msmtprc
rename to test/t-01-simple_local/msmtprc
diff --git a/test/t-simple_local/run.sh b/test/t-01-simple_local/run.sh
similarity index 100%
rename from test/t-simple_local/run.sh
rename to test/t-01-simple_local/run.sh
diff --git a/test/t-exim/.gitignore b/test/t-02-exim/.gitignore
similarity index 100%
rename from test/t-exim/.gitignore
rename to test/t-02-exim/.gitignore
diff --git a/test/t-simple_local/config/chasquid.conf b/test/t-02-exim/config/chasquid.conf
similarity index 100%
rename from test/t-simple_local/config/chasquid.conf
rename to test/t-02-exim/config/chasquid.conf
diff --git a/test/t-simple_local/config/domains/testserver/users b/test/t-02-exim/config/domains/srv-chasquid/users
similarity index 100%
rename from test/t-simple_local/config/domains/testserver/users
rename to test/t-02-exim/config/domains/srv-chasquid/users
diff --git a/test/t-exim/config/exim4.in b/test/t-02-exim/config/exim4.in
similarity index 100%
rename from test/t-exim/config/exim4.in
rename to test/t-02-exim/config/exim4.in
diff --git a/test/t-simple_local/content b/test/t-02-exim/content
similarity index 100%
rename from test/t-simple_local/content
rename to test/t-02-exim/content
diff --git a/test/t-exim/get-exim4-debian.sh b/test/t-02-exim/get-exim4-debian.sh
similarity index 100%
rename from test/t-exim/get-exim4-debian.sh
rename to test/t-02-exim/get-exim4-debian.sh
diff --git a/test/t-exim/hosts b/test/t-02-exim/hosts
similarity index 100%
rename from test/t-exim/hosts
rename to test/t-02-exim/hosts
diff --git a/test/t-exim/msmtprc b/test/t-02-exim/msmtprc
similarity index 100%
rename from test/t-exim/msmtprc
rename to test/t-02-exim/msmtprc
diff --git a/test/t-exim/run.sh b/test/t-02-exim/run.sh
similarity index 100%
rename from test/t-exim/run.sh
rename to test/t-02-exim/run.sh