diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install
index b3a80d86ae2b8c6130a5eb87176a2edfa63726c1..e6a7de3eb27f68345ac9535aea49c03e16966967 100644
--- a/debian/openvswitch-test.install
+++ b/debian/openvswitch-test.install
@@ -2,3 +2,4 @@ usr/bin/ovs-l3ping
 usr/bin/ovs-test
 usr/share/man/man8/ovs-l3ping.8
 usr/share/man/man8/ovs-test.8
+usr/share/openvswitch/python/ovstest usr/lib/python3/dist-packages/
diff --git a/debian/python3-openvswitch.install b/debian/python3-openvswitch.install
index ade3af05a9b3ee6e49c84046444e7f73793d3040..979f1c2651034fecc8bd7e820db047c9df102ca3 100644
--- a/debian/python3-openvswitch.install
+++ b/debian/python3-openvswitch.install
@@ -1,2 +1 @@
 usr/share/openvswitch/python/ovs usr/lib/python3/dist-packages/
-usr/share/openvswitch/python/ovstest usr/lib/python3/dist-packages/
diff --git a/debian/rules b/debian/rules
index 71e4a0dbd61a8ef1532220b0a7ca7f9a4302fd72..3b6b34ae7e5021ae31ee660c28f83ace285b7357 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,6 @@ else
 PARALLEL =
 endif
 
-PYTHON3S:=$(shell py3versions -vr)
 DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 override_dh_auto_configure:
@@ -240,13 +239,8 @@ override_dh_auto_install:
 	dh_auto_install --sourcedirectory=_debian
 
 execute_after_dh_install:
-	set -e && for pyvers in $(PYTHON3S); do \
-		cd python && python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/python3-openvswitch; cd ..; \
-		mkdir -p $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \
-		install -v -D -m 644 python/ovstest/*.py \
-			$(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \
-	done
+	cd python && python3 setup.py install --install-layout=deb \
+		--root $(CURDIR)/debian/python3-openvswitch
 
 override_dh_installinit:
 	dh_installinit --restart-after-upgrade
@@ -263,9 +257,6 @@ override_dh_installsystemd:
 override_dh_strip:
 	dh_strip --dbgsym-migration='openvswitch-dbg (<< 2.17~)'
 
-override_dh_python3:
-	dh_python3 --shebang=/usr/bin/python3
-
 # Helper target for creating snapshots from upstream git
 DATE=$(shell date +%Y%m%d)
 # Upstream branch to track