diff --git a/plugins/nginx/e2e/docker-compose.yml b/plugins/nginx/e2e/docker/docker-compose.yml
similarity index 75%
rename from plugins/nginx/e2e/docker-compose.yml
rename to plugins/nginx/e2e/docker/docker-compose.yml
index 7783e20..4e8d577 100644
--- a/plugins/nginx/e2e/docker-compose.yml
+++ b/plugins/nginx/e2e/docker/docker-compose.yml
@@ -7,9 +7,9 @@ services:
       - 8080:80
     volumes:
       # Used to load js module
-      - ./nginx.conf:/etc/nginx/nginx.conf
-      - ../njs/sablier.js:/etc/nginx/conf.d/sablier.js
-      - ./conf/nginx_docker_classic.conf:/etc/nginx/conf.d/default.conf
+      - ../nginx.conf:/etc/nginx/nginx.conf
+      - ../../njs/sablier.js:/etc/nginx/conf.d/sablier.js
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
 
   sablier:
     image: acouvreur/sablier:local
diff --git a/plugins/nginx/e2e/conf/nginx_docker_classic.conf b/plugins/nginx/e2e/docker/nginx.conf
similarity index 100%
rename from plugins/nginx/e2e/conf/nginx_docker_classic.conf
rename to plugins/nginx/e2e/docker/nginx.conf
diff --git a/plugins/nginx/e2e/docker_classic.sh b/plugins/nginx/e2e/docker/run.sh
similarity index 100%
rename from plugins/nginx/e2e/docker_classic.sh
rename to plugins/nginx/e2e/docker/run.sh
diff --git a/plugins/nginx/e2e/docker-stack.yml b/plugins/nginx/e2e/docker_swarm/docker-stack.yml
similarity index 80%
rename from plugins/nginx/e2e/docker-stack.yml
rename to plugins/nginx/e2e/docker_swarm/docker-stack.yml
index ed0148f..e89ad23 100644
--- a/plugins/nginx/e2e/docker-stack.yml
+++ b/plugins/nginx/e2e/docker_swarm/docker-stack.yml
@@ -10,9 +10,9 @@ services:
         mode: host # Won't work in github actions otherwise
     volumes:
       # Used to load js module
-      - ./nginx.conf:/etc/nginx/nginx.conf
-      - ../njs/sablier.js:/etc/nginx/conf.d/sablier.js
-      - ./conf/nginx_docker_swarm.conf:/etc/nginx/conf.d/default.conf
+      - ../nginx.conf:/etc/nginx/nginx.conf
+      - ../../njs/sablier.js:/etc/nginx/conf.d/sablier.js
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf
 
   sablier:
     image: acouvreur/sablier:local
diff --git a/plugins/nginx/e2e/conf/nginx_docker_swarm.conf b/plugins/nginx/e2e/docker_swarm/nginx.conf
similarity index 100%
rename from plugins/nginx/e2e/conf/nginx_docker_swarm.conf
rename to plugins/nginx/e2e/docker_swarm/nginx.conf
diff --git a/plugins/nginx/e2e/docker_swarm.sh b/plugins/nginx/e2e/docker_swarm/run.sh
similarity index 100%
rename from plugins/nginx/e2e/docker_swarm.sh
rename to plugins/nginx/e2e/docker_swarm/run.sh
diff --git a/plugins/nginx/e2e/docker-kubernetes.yml b/plugins/nginx/e2e/kubernetes/docker-kubernetes.yml
similarity index 100%
rename from plugins/nginx/e2e/docker-kubernetes.yml
rename to plugins/nginx/e2e/kubernetes/docker-kubernetes.yml
diff --git a/plugins/nginx/e2e/manifests/deployment.yml b/plugins/nginx/e2e/kubernetes/manifests/deployment.yml
similarity index 100%
rename from plugins/nginx/e2e/manifests/deployment.yml
rename to plugins/nginx/e2e/kubernetes/manifests/deployment.yml
diff --git a/plugins/nginx/e2e/manifests/sablier.yml b/plugins/nginx/e2e/kubernetes/manifests/sablier.yml
similarity index 100%
rename from plugins/nginx/e2e/manifests/sablier.yml
rename to plugins/nginx/e2e/kubernetes/manifests/sablier.yml
diff --git a/plugins/nginx/e2e/kubernetes.sh b/plugins/nginx/e2e/kubernetes/run.sh
similarity index 100%
rename from plugins/nginx/e2e/kubernetes.sh
rename to plugins/nginx/e2e/kubernetes/run.sh