diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml
index 17adde26be1b0bd074f46ecf7edcd6769a175265..bcdce370a3aca6bebd9dddf2b6c1c7bdd3730779 100644
--- a/playbooks/kayobe-overcloud-base/run.yml
+++ b/playbooks/kayobe-overcloud-base/run.yml
@@ -26,7 +26,10 @@
         cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm
         chdir: "{{ kayobe_src_dir }}"
 
-    - name: Perform testing of the baremetal machines
-      shell:
-        cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
-        chdir: "{{ kayobe_src_dir }}"
+    # NOTE(mgoddard): Bare metal testing in CI is currently very unreliable,
+    # making it difficult to merge patches. Skip this part of the testing until
+    # this can be improved.
+    # - name: Perform testing of the baremetal machines
+    #   shell:
+    #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-baremetal
+    #     chdir: "{{ kayobe_src_dir }}"
diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index 111f563e5d92cb3b46a3f63c8b017245e231d719..b4209907dada9a1a810165892a3621dc6faf9d1d 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -74,10 +74,13 @@
             cmd: dev/overcloud-test.sh > {{ logs_dir }}/ansible/overcloud-test-vm-pre-upgrade
             chdir: "{{ previous_kayobe_src_dir }}"
 
-        - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
-          shell:
-            cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
-            chdir: "{{ kayobe_src_dir }}"
+        # NOTE(mgoddard): Bare metal testing in CI is currently very
+        # unreliable, making it difficult to merge patches. Skip this part of
+        # the testing until # this can be improved.
+        # - name: Perform testing of the baremetal machines in the overcloud prior to upgrade
+        #   shell:
+        #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade
+        #     chdir: "{{ kayobe_src_dir }}"
 
         # Upgrade Kayobe, and use it to perform an upgrade of the control plane.
 
@@ -100,10 +103,13 @@
             cmd: dev/overcloud-test-vm.sh > {{ logs_dir }}/ansible/overcloud-test-vm-post-upgrade
             chdir: "{{ kayobe_src_dir }}"
 
-        - name: Perform testing of the baremetal machines in the upgraded overcloud
-          shell:
-            cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
-            chdir: "{{ kayobe_src_dir }}"
+        # NOTE(mgoddard): Bare metal testing in CI is currently very
+        # unreliable, making it difficult to merge patches. Skip this part of
+        # the testing until # this can be improved.
+        # - name: Perform testing of the baremetal machines in the upgraded overcloud
+        #   shell:
+        #     cmd: dev/overcloud-test-baremetal.sh > {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade
+        #     chdir: "{{ kayobe_src_dir }}"
 
       environment:
         KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"