@@ -3,6 +3,10 @@
 # Tests for vm-disk source types: source.image and source.disk.
 # Existing source.http coverage lives in vminstance.bats.
 
+teardown() {
+  kubectl -n tenant-test delete vmdisks.apps.cozystack.io test-image-src test-disk-clone test-disk-base --ignore-not-found --timeout=2m || true
+}
+
 @test "Create a VM Disk from source.image (golden image clone)" {
   name='test-image-src'
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
@@ -21,10 +25,9 @@ spec:
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$name --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$name --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name
 }
 
 @test "Create a VM Disk from source.disk (PVC clone)" {
@@ -35,8 +38,8 @@ EOF
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone --ignore-not-found --timeout=2m || true
   kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base --ignore-not-found --timeout=2m || true
 
-  # Create the base disk via source.http. Alpine is ~50MB vs Ubuntu noble's ~600MB,
-  # which keeps this test fast; the assertion here is the clone step, not the HTTP import.
+  # Create the base disk from a golden image. The assertion here is the clone
+  # step (source.disk), not the base provisioning method.
   kubectl apply -f - <<EOF
 apiVersion: apps.cozystack.io/v1alpha1
 kind: VMDisk
@@ -45,14 +48,14 @@ metadata:
   namespace: tenant-test
 spec:
   source:
-    http:
-      url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.6-x86_64-bios-cloudinit-r0.qcow2
+    image:
+      name: alpine-3.21
   optical: false
   storage: 5Gi
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$base --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$base --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$base --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$base --timeout=200s --for=jsonpath='{.status.phase}'=Bound
 
@@ -72,11 +75,7 @@ spec:
   storageClass: replicated
 EOF
   sleep 5
-  kubectl -n tenant-test wait hr vm-disk-$clone --timeout=5s --for=condition=ready
+  kubectl -n tenant-test wait hr vm-disk-$clone --timeout=30s --for=condition=ready
   kubectl -n tenant-test wait dv vm-disk-$clone --timeout=250s --for=condition=ready
   kubectl -n tenant-test wait pvc vm-disk-$clone --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-
-  # Cleanup both
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $clone
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $base
 }