diff --git a/tests/files/tf-elastx_ubuntu24-calico.yml b/tests/files/tf-elastx_ubuntu24-calico.yml
index b8dbaaa05..1c96d2ef0 100644
--- a/tests/files/tf-elastx_ubuntu24-calico.yml
+++ b/tests/files/tf-elastx_ubuntu24-calico.yml
@@ -1,5 +1,5 @@
 ---
-sonobuoy_enabled: true
+conformance_enabled: true
 
 # Ignore ping errors
 ignore_assert_errors: true
diff --git a/tests/testcases/100_check-k8s-conformance.yml b/tests/testcases/100_check-k8s-conformance.yml
index 56687fb03..a664e32f6 100644
--- a/tests/testcases/100_check-k8s-conformance.yml
+++ b/tests/testcases/100_check-k8s-conformance.yml
@@ -1,22 +1,3 @@
 ---
-- name: Download sonobuoy
-  get_url:
-    url: "https://github.com/vmware-tanzu/sonobuoy/releases/download/v{{ sonobuoy_version }}/sonobuoy_{{ sonobuoy_version }}_linux_{{ sonobuoy_arch }}.tar.gz"
-    dest: /tmp/sonobuoy.tar.gz
-    mode: "0644"
-
-- name: Extract sonobuoy
-  unarchive:
-    src: /tmp/sonobuoy.tar.gz
-    dest: /usr/local/bin/
-    copy: false
-
-- name: Run sonobuoy
-  command: "{{ sonobuoy_path }} run --mode {{ sonobuoy_mode }} --e2e-parallel {{ sonobuoy_parallel }} --wait"
-
-- name: Run sonobuoy retrieve
-  command: "{{ sonobuoy_path }} retrieve"
-  register: sonobuoy_retrieve
-
-- name: Run inspect results
-  command: "{{ sonobuoy_path }} results {{ sonobuoy_retrieve.stdout }} --plugin e2e --mode report"
+- name: Run the conformance smoke test
+  command: '{{ hydrophone_path }} --focus="Pods should be submitted and removed" --parallel {{ hydrophone_parallel }}'
diff --git a/tests/testcases/tests.yml b/tests/testcases/tests.yml
index 29879598a..394f94cde 100644
--- a/tests/testcases/tests.yml
+++ b/tests/testcases/tests.yml
@@ -40,12 +40,4 @@
       import_tasks: 100_check-k8s-conformance.yml
       delegate_to: "{{ groups['kube_control_plane'][0] }}"
       run_once: true
-      when:
-        - sonobuoy_enabled is defined
-        - sonobuoy_enabled
-      vars:
-        sonobuoy_version: 0.57.3
-        sonobuoy_arch: amd64
-        sonobuoy_parallel: 30
-        sonobuoy_path: /usr/local/bin/sonobuoy
-        sonobuoy_mode: Quick
+      when: conformance_enabled | default(false)