diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 912e4f552313..c00cf30e91e0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -73,7 +73,7 @@ in
   #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
   ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};
   ecryptfs = handleTest ./ecryptfs.nix {};
-  ejabberd = handleTest ./ejabberd.nix {};
+  ejabberd = handleTest ./xmpp/ejabberd.nix {};
   elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
   env = handleTest ./env.nix {};
   etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
@@ -209,7 +209,7 @@ in
   prometheus = handleTest ./prometheus.nix {};
   prometheus2 = handleTest ./prometheus-2.nix {};
   prometheus-exporters = handleTest ./prometheus-exporters.nix {};
-  prosody = handleTest ./prosody.nix {};
+  prosody = handleTest ./xmpp/prosody.nix {};
   proxy = handleTest ./proxy.nix {};
   quagga = handleTest ./quagga.nix {};
   quake3 = handleTest ./quake3.nix {};
diff --git a/nixos/tests/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
similarity index 99%
rename from nixos/tests/ejabberd.nix
rename to nixos/tests/xmpp/ejabberd.nix
index 0691dfe780d2..7eb566b54685 100644
--- a/nixos/tests/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ../make-test.nix ({ pkgs, ... }: {
   name = "ejabberd";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ajs124 ];
diff --git a/nixos/tests/prosody.nix b/nixos/tests/xmpp/prosody.nix
similarity index 97%
rename from nixos/tests/prosody.nix
rename to nixos/tests/xmpp/prosody.nix
index a39bae7898dc..3241cee79c9a 100644
--- a/nixos/tests/prosody.nix
+++ b/nixos/tests/xmpp/prosody.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ../make-test.nix {
   name = "prosody";
 
   machine = { pkgs, ... }: {
diff --git a/nixos/tests/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix
similarity index 100%
rename from nixos/tests/xmpp-sendmessage.nix
rename to nixos/tests/xmpp/xmpp-sendmessage.nix