diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index 5e8a332..6dfef61 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -18,7 +18,3 @@
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
   version: master
-- name: previous_qdrouterd_server
-  src: https://github.com/ajssmith/ansible-qdrouterd
-  scm: git
-  version: master
diff --git a/tests/qdrouterd-overrides.yml b/tests/qdrouterd-overrides.yml
index 84a036e..38ece51 100644
--- a/tests/qdrouterd-overrides.yml
+++ b/tests/qdrouterd-overrides.yml
@@ -1,2 +1,21 @@
+---
+# Copyright 2018, Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 qdrouterd_ssl_cert: /etc/qpid-dispatch/ssl/qdrouterd.pem
 qdrouterd_ssl_key: /etc/qpid-dispatch/ssl/qdrouterd.key
+qdrouterd_worker_threads: 2
+qdrouterd_require_ssl: no
+qdrouterd_listener_port: 31459
+qdrouterd_irl_port: 31460
diff --git a/tests/test-install-previous-qdrouterd.yml b/tests/test-install-previous-qdrouterd.yml
deleted file mode 100644
index ea837e8..0000000
--- a/tests/test-install-previous-qdrouterd.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Copyright 2018, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Gather facts
-  hosts: "all"
-  user: root
-  gather_facts: true
-
-# Install previous version
-- name: Deploy previous qdrouterd version
-  hosts: qdrouterd_all
-  user: root
-  serial: 1
-  any_errors_fatal: true
-  gather_facts: true
-  roles:
-    - role: "previous_qdrouterd_server"
-  vars_files:
-    - common/previous/test-vars.yml
diff --git a/tests/test-install-qdrouterd.yml b/tests/test-install-qdrouterd.yml
index 7780dcb..a46e643 100644
--- a/tests/test-install-qdrouterd.yml
+++ b/tests/test-install-qdrouterd.yml
@@ -27,5 +27,3 @@
   any_errors_fatal: true
   roles:
     - role: "qdrouterd"
-  vars_files:
-    - test-vars.yml
diff --git a/tests/test-upgrade-post.yml b/tests/test-upgrade-post.yml
deleted file mode 100644
index 633de04..0000000
--- a/tests/test-upgrade-post.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-# Copyright 2018, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Install Qdrouterd server
-- include: common/test-install-qdrouterd.yml
-
-# Run functional tests
-- include: test-qdrouterd-functional.yml
diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml
deleted file mode 100644
index 8e6d766..0000000
--- a/tests/test-upgrade-pre.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# 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.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Setup the host
-- include: common/test-setup-host.yml
diff --git a/tests/test-vars.yml b/tests/test-vars.yml
deleted file mode 100644
index f428910..0000000
--- a/tests/test-vars.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# Copyright 2018, Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-qdrouterd_worker_threads: 2
-qdrouterd_require_ssl: no
-qdrouterd_listener_port: 31459
-qdrouterd_irl_port: 31460
diff --git a/tox.ini b/tox.ini
index 85dd132..8d6e177 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,15 +86,6 @@ commands =
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
 
 
-[testenv:upgrade]
-setenv =
-    {[testenv]setenv}
-    ANSIBLE_OVERRIDES={toxinidir}/tests/qdrouterd-overrides.yml
-    CLONE_UPGRADE_TESTS=yes
-commands =
-    bash -c "{toxinidir}/tests/test-qdrouterd-upgrades.sh"
-
-
 [testenv:linters]
 commands =
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ced4237..1052b0a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,8 +22,6 @@
             voting: false
         - openstack-ansible-functional-ubuntu-xenial:
             voting: false
-        - openstack-ansible-upgrade-ubuntu-xenial:
-            voting: false
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio