diff --git a/.gitignore b/.gitignore
index 0756df8..fbfb885 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,3 @@
 /v1.5.1.tar.gz
 /v1.5.2.tar.gz
 /v1.6.0.tar.gz
-/v1.7.0.tar.gz
-/v1.8.0.tar.gz
-/v1.8.1.tar.gz
-/v1.9.0.tar.gz
-/v1.10.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 5fa17e8..fadf03a 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -11,9 +11,9 @@ jobs:
    - fedora-all
   actions:
     changelog-entry:
-    - bash -c '[ -n "$PACKIT_RESOLVED_BUGS" ] && echo "Update to ${PACKIT_PROJECT_VERSION} (${PACKIT_RESOLVED_BUGS})" || echo "Update to ${PACKIT_PROJECT_VERSION}"'
+    - bash -c '[ -n "$PACKIT_RESOLVED_BUGS" ] && echo "Update to ${PACKIT_PROJECT_VERSION} (rhbz#${PACKIT_RESOLVED_BUGS})" || echo "Update to ${PACKIT_PROJECT_VERSION}"'
     commit-message:
-    - bash -c '[ -n "$PACKIT_RESOLVED_BUGS" ] && echo "Update to ${PACKIT_PROJECT_VERSION} (${PACKIT_RESOLVED_BUGS})" || echo "Update to ${PACKIT_PROJECT_VERSION}"'
+    - bash -c '[ -n "$PACKIT_RESOLVED_BUGS" ] && echo "Update to ${PACKIT_PROJECT_VERSION} (rhbz#${PACKIT_RESOLVED_BUGS})" || echo "Update to ${PACKIT_PROJECT_VERSION}"'
 - job: koji_build
   trigger: commit
   allowed_committers: ["lbalhar", "packit"]
diff --git a/README.packit b/README.packit
index 8c905b9..ef95206 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.106.0.post1.dev8+g521f1e1d.
+The file was generated using packit 0.87.0.
diff --git a/micropipenv.spec b/micropipenv.spec
index a687b1d..6087095 100644
--- a/micropipenv.spec
+++ b/micropipenv.spec
@@ -6,7 +6,7 @@
 %endif
 
 Name:           micropipenv
-Version:        1.10.0
+Version:        1.6.0
 Release:        %autorelease
 Summary:        A simple wrapper around pip to support Pipenv and Poetry files
 
@@ -31,10 +31,6 @@ converting them to pip-tools compatible output.
 %autosetup
 # Remove shebang line from the module
 sed -i '1{\@^#!/usr/bin/env python@d}' %{name}.py
-# Remove virtualenv requirement from tox.ini
-sed -i '/requires = virtualenv/d' tox.ini
-# Do not install wheel in testing venvs
-sed -i 's/[^ ]*wheel==0.45.1.*/pass/' tests/conftest.py
 
 %generate_buildrequires
 %pyproject_buildrequires -r %{?with_tests:-t} -x toml
diff --git a/plan.fmf b/plans/integration.fmf
similarity index 86%
rename from plan.fmf
rename to plans/integration.fmf
index a418c92..51e5bdf 100644
--- a/plan.fmf
+++ b/plans/integration.fmf
@@ -1,6 +1,6 @@
+summary: Integration tests for micropipenv
 discover:
     how: fmf
-    dist-git-source: true
 execute:
     how: tmt
 prepare:
diff --git a/sources b/sources
index 3b743a0..adf89fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.10.0.tar.gz) = 8508777d2cc04f3aa9faf834a75154d5d3aa8e24ca5551febce4c40c78d32b4cae0753bdf26fc6118b2033852bda4370ef869949389e745991a46b9d44981cf5
+SHA512 (v1.6.0.tar.gz) = 4d4a9e13d9eb02ef10a18b2b3822eeef5bd49ee35e82750fa5c062555c1eed83ddd0ff5ebe5ca6d262d459f2115573c0a917e9caeae4806aab23606a6907b3a0
diff --git a/tests/smoke.fmf b/tests/smoke.fmf
deleted file mode 100644
index 25498bb..0000000
--- a/tests/smoke.fmf
+++ /dev/null
@@ -1,2 +0,0 @@
-test: bash ./smoke.sh
-framework: shell
diff --git a/tests/smoke.sh b/tests/smoke.sh
deleted file mode 100644
index fee1bf2..0000000
--- a/tests/smoke.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -ex
-
-username="test_$$"
-id "$username" && userdel -rf "$username"
-
-useradd "$username"
-su -l -c "echo simple-manylinux-demo > requirements.txt" "$username"
-su -l -c "micropipenv install -- --user" "$username"
-su -l -c "python3 -c 'from dummyextension.extension import hello; assert hello() == \"Hello from Python extension!\"'" "$username"
-
-userdel -rf "$username"
diff --git a/tests/upstream.fmf b/tests/upstream.fmf
deleted file mode 100644
index d350ffc..0000000
--- a/tests/upstream.fmf
+++ /dev/null
@@ -1,13 +0,0 @@
-summary: upstream testsuite
-require:
-  - python3-devel
-  - python3-test
-  - python3-pip
-  - python3-pytest
-  - python3-pytest-venv
-  # flexmock installed from PyPI, not available in RHEL
-test: |
-  pip install flexmock==0.12.1 &&
-  cd $(dirname $TMT_SOURCE_DIR/micropipenv-*/tests) &&
-  pytest -v
-duration: 5m