diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 8d41fe8..88c71cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
 /libusb-compat-0.1.7.tar.bz2
-/libusb-compat-0.1-0.1.8-rc1.tar.bz2
-/libusb-compat-0.1.8.tar.bz2
diff --git a/libusb-compat-0.1.spec b/libusb-compat-0.1.spec
index 90ad4e5..d2bed41 100644
--- a/libusb-compat-0.1.spec
+++ b/libusb-compat-0.1.spec
@@ -1,9 +1,8 @@
 Name:           libusb-compat-0.1
-Version:        0.1.8
-Release:        %autorelease
+Version:        0.1.7
+Release:        3%{?dist}
 Summary:        Compatibility shim around libusb-1.0 offering the old 0.1 API
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+License:        LGPLv2+
 URL:            https://github.com/libusb/libusb-compat-0.1
 Source0:        https://github.com/libusb/libusb-compat-0.1/releases/download/v%{version}/libusb-compat-%{version}.tar.bz2
 Patch0:         libusb-config-multilib.patch
@@ -14,8 +13,6 @@ Provides:       deprecated()
 # libusb was removed in F34
 Provides:       libusb = 1:%{version}-%{release}
 Obsoletes:      libusb < 1:%{version}-%{release}
-# libusb-compat-0.1 version 0.1.6 and later dlopen'ed the library
-Requires:       libusb1%{?_isa}
 
 %description
 This package provides a shim / compatibility layer on top of libusb1
@@ -91,4 +88,6 @@ LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-compat-0.1-testlib
 
 
 %changelog
-%autochangelog
+* Tue Jan 19 18:48:25 CET 2021 Benjamin Berg <bberg@redhat.com> - 0.1.7-3
+- New libusb-compat-0.1 package replacing libusb
+  Resolves: #1918275
diff --git a/plans/integration.fmf b/plans/integration.fmf
deleted file mode 100644
index c427c9e..0000000
--- a/plans/integration.fmf
+++ /dev/null
@@ -1,5 +0,0 @@
-summary: Tests for libusb-compat-0.1
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/sources b/sources
index 77141ab..702ba65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libusb-compat-0.1.8.tar.bz2) = 817a16a2c7268e0d73add97c06ec3f6e4fc4b8697bd3129bb6f907f138c2a5dccb662096c4cd0385341053b216afd398b21dfef14676777b906972c9e3af4e3e
+SHA512 (libusb-compat-0.1.7.tar.bz2) = 94ba2a767959a40a5fe41760d7c20968fb99456de3f5b7547414bd061ab5155d88ca382b6aa1cf4961e15f1bc4890134351902e719ce5aa15dd0202f72417d55
diff --git a/tests/integration/main.fmf b/tests/integration/main.fmf
deleted file mode 100644
index d3f0b3f..0000000
--- a/tests/integration/main.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Integration test of libusb-compat-0.1
-require:
-    - libusb1-devel
-    - libusb-compat-0.1-tests-examples
-test: bash ./run.sh
-
diff --git a/tests/integration/run.sh b/tests/run.sh
similarity index 100%
rename from tests/integration/run.sh
rename to tests/run.sh
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..dbb25fd
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  # We don't need standard-test-source, and it would need things for %prep
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    tests:
+    - test:
+        dir: .
+        run: run.sh
+