diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0cd9f6778dcaf306e634a7f1af41d229b836d9a..457d70e5116b15d249175545ba73d9c46284a202 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -406,11 +406,11 @@ obs:fedora34:x86_64:
     DISTROTEST_NAME: fedora34
     DISTROTEST_REPO: Fedora_34
 
-obs:fedora33:x86_64:
+obs:fedora35:x86_64:
   <<: *distrotest
   variables:
-    DISTROTEST_NAME: fedora33
-    DISTROTEST_REPO: Fedora_33
+    DISTROTEST_NAME: fedora35
+    DISTROTEST_REPO: Fedora_35
 
 obs:leap15:x86_64:
   <<: *distrotest
@@ -430,8 +430,8 @@ obs:ubuntu2004:x86_64:
     DISTROTEST_NAME: ubuntu2004
     DISTROTEST_REPO: xUbuntu_20.04
 
-obs:ubuntu2104:x86_64:
+obs:ubuntu2110:x86_64:
   <<: *distrotest
   variables:
-    DISTROTEST_NAME: ubuntu2104
-    DISTROTEST_REPO: xUbuntu_21.04
+    DISTROTEST_NAME: ubuntu2110
+    DISTROTEST_REPO: xUbuntu_21.10
diff --git a/distro/tests/fedora34/Vagrantfile b/distro/tests/fedora34/Vagrantfile
index 248164c5f443dd97430d5e011fb1b6c2e5c60d33..a55e0b2299717fb27ed9f269bcd723e6b897b10b 100644
--- a/distro/tests/fedora34/Vagrantfile
+++ b/distro/tests/fedora34/Vagrantfile
@@ -5,10 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/32-cloud-base"
+    config.vm.box = "fedora/34-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora32_knot-dns"  do |machine|
+    config.vm.define "fedora34_knot-dns"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-dns-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/fedora33/Vagrantfile b/distro/tests/fedora35/Vagrantfile
similarity index 85%
rename from distro/tests/fedora33/Vagrantfile
rename to distro/tests/fedora35/Vagrantfile
index 0644b44e550b043eb21bf6f1db63ab8acf83a852..4f079555ead5accb0c20070e4464ab0e02b90675 100644
--- a/distro/tests/fedora33/Vagrantfile
+++ b/distro/tests/fedora35/Vagrantfile
@@ -4,10 +4,10 @@
 
 Vagrant.configure(2) do |config|
 
-    config.vm.box = "fedora/33-cloud-base"
+    config.vm.box = "fedora/35-cloud-base"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "fedora33_knot-dns"  do |machine|
+    config.vm.define "fedora35_knot-dns"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-dns-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/fedora33/ansible.cfg b/distro/tests/fedora35/ansible.cfg
similarity index 100%
rename from distro/tests/fedora33/ansible.cfg
rename to distro/tests/fedora35/ansible.cfg
diff --git a/distro/tests/ubuntu2104/Vagrantfile b/distro/tests/ubuntu2110/Vagrantfile
similarity index 78%
rename from distro/tests/ubuntu2104/Vagrantfile
rename to distro/tests/ubuntu2110/Vagrantfile
index 26cce579bd6b8e01b5cd7ab8f9a34439e4356cfb..d388db0a7d18af06dcc0bc1ac9c55268113b1d83 100644
--- a/distro/tests/ubuntu2104/Vagrantfile
+++ b/distro/tests/ubuntu2110/Vagrantfile
@@ -5,11 +5,10 @@
 
 Vagrant.configure(2) do |config|
 
-    # TODO: switch to generic/ubuntu2104 when available (has libvirt box)
-    config.vm.box = "ubuntu/hirsute64"
+    config.vm.box = "generic/ubuntu2110"
     config.vm.synced_folder ".", "/vagrant", disabled: true
 
-    config.vm.define "ubuntu2104_knot-dns"  do |machine|
+    config.vm.define "ubuntu2110_knot-dns"  do |machine|
         machine.vm.provision "ansible" do |ansible|
             ansible.playbook = "../knot-dns-pkgtest.yaml"
             ansible.extra_vars = {
diff --git a/distro/tests/ubuntu2104/ansible.cfg b/distro/tests/ubuntu2110/ansible.cfg
similarity index 100%
rename from distro/tests/ubuntu2104/ansible.cfg
rename to distro/tests/ubuntu2110/ansible.cfg