diff --git a/neonvm/samples/vm-example.virtio-mem.yaml b/neonvm/samples/vm-example.yaml
similarity index 100%
rename from neonvm/samples/vm-example.virtio-mem.yaml
rename to neonvm/samples/vm-example.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/00-assert.yaml b/tests/e2e/autoscaling/00-assert.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/00-assert.yaml
rename to tests/e2e/autoscaling/00-assert.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/00-create-vm.yaml b/tests/e2e/autoscaling/00-create-vm.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/00-create-vm.yaml
rename to tests/e2e/autoscaling/00-create-vm.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/01-assert.yaml b/tests/e2e/autoscaling/01-assert.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/01-assert.yaml
rename to tests/e2e/autoscaling/01-assert.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/01-upscale.yaml b/tests/e2e/autoscaling/01-upscale.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/01-upscale.yaml
rename to tests/e2e/autoscaling/01-upscale.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/02-assert.yaml b/tests/e2e/autoscaling/02-assert.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/02-assert.yaml
rename to tests/e2e/autoscaling/02-assert.yaml
diff --git a/tests/e2e/autoscaling.virtio-mem/02-downscale.yaml b/tests/e2e/autoscaling/02-downscale.yaml
similarity index 100%
rename from tests/e2e/autoscaling.virtio-mem/02-downscale.yaml
rename to tests/e2e/autoscaling/02-downscale.yaml
diff --git a/tests/e2e/vm-migration.virtio-mem/00-assert.yaml b/tests/e2e/vm-migration/00-assert.yaml
similarity index 100%
rename from tests/e2e/vm-migration.virtio-mem/00-assert.yaml
rename to tests/e2e/vm-migration/00-assert.yaml
diff --git a/tests/e2e/vm-migration.virtio-mem/00-prepare.yaml b/tests/e2e/vm-migration/00-prepare.yaml
similarity index 94%
rename from tests/e2e/vm-migration.virtio-mem/00-prepare.yaml
rename to tests/e2e/vm-migration/00-prepare.yaml
index dfef6b0ab..66d1af845 100644
--- a/tests/e2e/vm-migration.virtio-mem/00-prepare.yaml
+++ b/tests/e2e/vm-migration/00-prepare.yaml
@@ -1,7 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 apply:
-- ../../../neonvm/samples/vm-example.virtio-mem.yaml
+- ../../../neonvm/samples/vm-example.yaml
 unitTest: false
 ---
 apiVersion: v1
diff --git a/tests/e2e/vm-migration.virtio-mem/01-assert.yaml b/tests/e2e/vm-migration/01-assert.yaml
similarity index 100%
rename from tests/e2e/vm-migration.virtio-mem/01-assert.yaml
rename to tests/e2e/vm-migration/01-assert.yaml
diff --git a/tests/e2e/vm-migration.virtio-mem/01-migrate.yaml b/tests/e2e/vm-migration/01-migrate.yaml
similarity index 100%
rename from tests/e2e/vm-migration.virtio-mem/01-migrate.yaml
rename to tests/e2e/vm-migration/01-migrate.yaml