diff --git a/bindep.txt b/bindep.txt
index a62cff8..c648fb1 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -26,7 +26,7 @@
 gcc
 
 # Base requirements for Ubuntu
-git-core          [platform:dpkg]
+git-core          [platform:dpkg platform:suse]
 libssl-dev        [platform:dpkg]
 libffi-dev        [platform:dpkg]
 python2.7         [platform:dpkg]
@@ -38,7 +38,7 @@ python3-dev       [platform:dpkg]
 
 # Base requirements for RPM distros
 gcc-c++           [platform:rpm]
-git               [platform:rpm]
+git               [platform:rpm !platform:suse]
 libffi-devel      [platform:rpm]
 openssl-devel     [platform:rpm]
 python-devel      [platform:rpm]
diff --git a/run_tests.sh b/run_tests.sh
index db7a1a1..5f21989 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019, Rackspace US, Inc.
+# Copyright 2015, Rackspace US, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -59,7 +59,8 @@ case ${ID,,} in
     *suse*) pkg_mgr_cmd="zypper -n in" ;;
     centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
     ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
-    gentoo) pkg_mgr_cmd="emerge" ;;
+    # Gentoo needs to have version set since it's rolling
+    gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
     *) echo "unsupported distribution: ${ID,,}"; exit 1 ;;
 esac
 
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index a2d7ad4..b5f4766 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2019, Rackspace US, Inc.
+# Copyright 2018, Rackspace US, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 - name: Setup RPC MQ Service (RabbitMQ)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"
   when:
-    - (_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))
-    - (_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'rabbit')
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'rabbit')"
   tags:
     - common-rabbitmq
   block:
@@ -73,8 +73,8 @@
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"
   when:
-    - (_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))
-    - (_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')"
   tags:
     - common-qdrouterd
   block: