diff --git a/cfe_internal/enterprise/federation/federation.cf b/cfe_internal/enterprise/federation/federation.cf
index 7f244f4998..0bf5642b5e 100644
--- a/cfe_internal/enterprise/federation/federation.cf
+++ b/cfe_internal/enterprise/federation/federation.cf
@@ -256,15 +256,15 @@ bundle agent distributed_cleanup_dependencies
     (redhat_6|centos_6)::
       "cfengine_mp_fr_distributed_cleanup_python3_installed"
         expression => returnszero(
-          "$(sys.bindir)/cfengine-selected-python --version | grep -q ' 3.'",
-          "useshell"
+          "$(sys.bindir)/cfengine-selected-python -c 'import sys; exit(sys.version_info < (3,))'",
+          noshell
         );
 
     (redhat_6|centos_6|redhat_7|centos_7)::
       "cfengine_mp_fr_distributed_cleanup_urllib3_installed"
         expression => returnszero(
-          "echo 'import urllib3' | $(sys.bindir)/cfengine-selected-python 2>/dev/null",
-          "useshell"
+          "$(sys.bindir)/cfengine-selected-python -c 'try: import urllib3$(const.n)except ModuleNotFoundError: exit(1)'",
+          noshell
         );
 
   packages: