diff --git a/tests/infrastructure/default.nix b/tests/overlay/default.nix
similarity index 100%
rename from tests/infrastructure/default.nix
rename to tests/overlay/default.nix
diff --git a/tests/infrastructure/keys/ca.crt b/tests/overlay/keys/ca.crt
similarity index 100%
rename from tests/infrastructure/keys/ca.crt
rename to tests/overlay/keys/ca.crt
diff --git a/tests/infrastructure/keys/ca.key b/tests/overlay/keys/ca.key
similarity index 100%
rename from tests/infrastructure/keys/ca.key
rename to tests/overlay/keys/ca.key
diff --git a/tests/infrastructure/keys/client1-ssh b/tests/overlay/keys/client1-ssh
similarity index 100%
rename from tests/infrastructure/keys/client1-ssh
rename to tests/overlay/keys/client1-ssh
diff --git a/tests/infrastructure/keys/client1-ssh.pub b/tests/overlay/keys/client1-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/client1-ssh.pub
rename to tests/overlay/keys/client1-ssh.pub
diff --git a/tests/infrastructure/keys/client1.crt b/tests/overlay/keys/client1.crt
similarity index 100%
rename from tests/infrastructure/keys/client1.crt
rename to tests/overlay/keys/client1.crt
diff --git a/tests/infrastructure/keys/client1.key b/tests/overlay/keys/client1.key
similarity index 100%
rename from tests/infrastructure/keys/client1.key
rename to tests/overlay/keys/client1.key
diff --git a/tests/infrastructure/keys/client2-ssh b/tests/overlay/keys/client2-ssh
similarity index 100%
rename from tests/infrastructure/keys/client2-ssh
rename to tests/overlay/keys/client2-ssh
diff --git a/tests/infrastructure/keys/client2-ssh.pub b/tests/overlay/keys/client2-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/client2-ssh.pub
rename to tests/overlay/keys/client2-ssh.pub
diff --git a/tests/infrastructure/keys/client2.crt b/tests/overlay/keys/client2.crt
similarity index 100%
rename from tests/infrastructure/keys/client2.crt
rename to tests/overlay/keys/client2.crt
diff --git a/tests/infrastructure/keys/client2.key b/tests/overlay/keys/client2.key
similarity index 100%
rename from tests/infrastructure/keys/client2.key
rename to tests/overlay/keys/client2.key
diff --git a/tests/infrastructure/keys/lighthouse.crt b/tests/overlay/keys/lighthouse.crt
similarity index 100%
rename from tests/infrastructure/keys/lighthouse.crt
rename to tests/overlay/keys/lighthouse.crt
diff --git a/tests/infrastructure/keys/lighthouse.key b/tests/overlay/keys/lighthouse.key
similarity index 100%
rename from tests/infrastructure/keys/lighthouse.key
rename to tests/overlay/keys/lighthouse.key
diff --git a/tests/infrastructure/keys/server-ssh b/tests/overlay/keys/server-ssh
similarity index 100%
rename from tests/infrastructure/keys/server-ssh
rename to tests/overlay/keys/server-ssh
diff --git a/tests/infrastructure/keys/server-ssh.pub b/tests/overlay/keys/server-ssh.pub
similarity index 100%
rename from tests/infrastructure/keys/server-ssh.pub
rename to tests/overlay/keys/server-ssh.pub
diff --git a/tests/infrastructure/keys/server.crt b/tests/overlay/keys/server.crt
similarity index 100%
rename from tests/infrastructure/keys/server.crt
rename to tests/overlay/keys/server.crt
diff --git a/tests/infrastructure/keys/server.key b/tests/overlay/keys/server.key
similarity index 100%
rename from tests/infrastructure/keys/server.key
rename to tests/overlay/keys/server.key