diff --git a/test/integration/roles/test_apt/tasks/apt.yml b/test/integration/roles/test_apt/tasks/apt.yml
index 151f5313595..be0facdf098 100644
--- a/test/integration/roles/test_apt/tasks/apt.yml
+++ b/test/integration/roles/test_apt/tasks/apt.yml
@@ -1,4 +1,19 @@
-# UNINSTALL
+# UNINSTALL 'python-apt'
+#  The `apt` module has the smarts to auto-install `python-apt`.  To test, we
+#  will first uninstall `python-apt`.
+- name: check python-apt with dpkg
+  shell: dpkg -s python-apt
+  register: dpkg_result
+  ignore_errors: true
+
+- name: uninstall python-apt with apt
+  apt: pkg=python-apt state=absent purge=yes
+  register: apt_result
+  when: dpkg_result|success
+
+# UNINSTALL 'hello'
+#   With 'python-apt' uninstalled, the first call to 'apt' should install
+#   python-apt.
 - name: uninstall hello with apt
   apt: pkg=hello state=absent purge=yes
   register: apt_result
@@ -8,9 +23,6 @@
   failed_when: False
   register: dpkg_result
 
-- debug: var=apt_result
-- debug: var=dpkg_result
-
 - name: verify uninstallation of hello
   assert:
     that:
diff --git a/test/integration/roles/test_yum/tasks/yum.yml b/test/integration/roles/test_yum/tasks/yum.yml
index 7c0b089ace5..316b8b3a77f 100644
--- a/test/integration/roles/test_yum/tasks/yum.yml
+++ b/test/integration/roles/test_yum/tasks/yum.yml
@@ -1,4 +1,21 @@
+# UNINSTALL 'yum-utils'
+#  The `yum` module has the smarts to auto-install `yum-utils`.  To test, we
+#  will first uninstall `yum-utils`.
+- name: check yum-utils with rpm
+  shell: rpm -q yum-utils
+  register: rpm_result
+  ignore_errors: true
+
+# Don't uninstall yum-utils with the `yum` module, it would be bad.  The `yum`
+# module does some `repoquery` magic after removing a package.  It fails when you
+# remove `yum-utils.
+- name: uninstall yum-utils with shell
+  shell: yum -y remove yum-utils
+  when: rpm_result|success
+
 # UNINSTALL
+#   With 'yum-utils' uninstalled, the first call to 'yum' should install
+#   yum-utils.
 - name: uninstall sos
   yum: name=sos state=removed
   register: yum_result