diff --git a/.zuul.yaml b/.zuul.yaml
index a8fdd9492..614cff4b5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,6 +3,7 @@
     parent: openstack-tox-py27
     vars:
       tox_envlist: py27-func-amqp1
+      bindep_profile: amqp1
 
 - job:
     name: oslo.messaging-tox-py27-func-kafka
@@ -23,6 +24,7 @@
     parent: openstack-tox-py35
     vars:
       tox_envlist: py35-func-amqp1
+      bindep_profile: amqp1
 
 - job:
     name: oslo.messaging-tox-py35-func-kafka
diff --git a/bindep.txt b/bindep.txt
index d9728bbc0..6fafbe05a 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -26,20 +26,21 @@ python2-zmq [platform:fedora zmq]
 dev-python/pyzmq [platform:gentoo zmq]
 
 # AMQP1 dpkg
-qpidd [platform:dpkg amqp1]
-sasl2-bin [platform:dpkg amqp1]
-uuid-dev [platform:dpkg amqp1]
-swig [platform:dpkg amqp1]
-libsasl2-modules [platform:dpkg amqp1]
+# This needs qpid/testing, will be installed by tools/test-setup.sh
+# qpidd [platform:dpkg amqp1 test]
+sasl2-bin [platform:dpkg amqp1 test]
+uuid-dev [platform:dpkg amqp1 test]
+swig [platform:dpkg amqp1 test]
+libsasl2-modules [platform:dpkg amqp1 test]
 
-# AMQP1 rpm
-qpid-cpp-server [platform:rpm amqp1]
-qpid-proton-c-devel [platform:rpm amqp1]
-python-qpid-proton [platform:rpm amqp1]
-cyrus-sasl-lib [platform:rpm amqp1]
-cyrus-sasl-plain [platform:rpm amqp1]
-libuuid-devel [platform:rpm amqp1]
-swig [platform:rpm amqp1]
+# AMQP1 TEST rpm
+qpid-cpp-server [platform:rpm amqp1 test]
+qpid-proton-c-devel [platform:rpm amqp1 test]
+python-qpid-proton [platform:rpm amqp1 test]
+cyrus-sasl-lib [platform:rpm amqp1 test]
+cyrus-sasl-plain [platform:rpm amqp1 test]
+libuuid-devel [platform:rpm amqp1 test]
+swig [platform:rpm amqp1 test]
 
 # kafka dpkg
 openjdk-8-jdk [platform:dpkg kafka]
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 0d49f7f2b..e52aeb4b3 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -6,21 +6,9 @@
 
 # This setup for amqp1 needs to be run by a user that can run sudo.
 
-function is_fedora {
-    [ -f /usr/bin/yum ] && cat /etc/*release | grep -q -e "Fedora"
-}
-
-# NOTE(sileht): we create the virtualenv only and use bindep directly
-# because tox doesn't have a quiet option...
-tox -ebindep --notest
-
-# TODO(ansmith) for now setup amqp1 dependencies for any profile.
-# Fix this when test-setup is passed environment profile setting.
-
-# NOTE(sileht): bindep return 1 if some packages have to be installed
-PACKAGES="$(.tox/bindep/bin/bindep -b -f bindep.txt amqp1 || true)"
-
-[ -n "$PACKAGES" ] || exit 0
+# qpidd needs to be installed from qpid/testing repo in Ubuntu.
+# bindep does not allow setting up another repo, so we just install
+# this package here.
 
 # inspired from project-config install-distro-packages.sh
 if apt-get -v >/dev/null 2>&1 ; then
@@ -28,11 +16,5 @@ if apt-get -v >/dev/null 2>&1 ; then
     sudo apt-get -qq update
     sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
         apt-get -q --option "Dpkg::Options::=--force-confold" \
-        --assume-yes install $PACKAGES
-elif emerge --version >/dev/null 2>&1 ; then
-    sudo emerge -uDNq --jobs=4 @world
-    sudo PATH=/usr/sbin:/sbin:$PATH emerge -q --jobs=4 $PACKAGES
-else
-    is_fedora && YUM=dnf || YUM=yum
-    sudo PATH=/usr/sbin:/sbin:$PATH $YUM install -y $PACKAGES
+        --assume-yes install qpidd
 fi