diff --git a/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild b/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
similarity index 86%
rename from x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
index f3ead55478..e8bf7a4aaf 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-3.24.30.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-3.24.30-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 FORTRAN_STANDARD=2003
+VIRTUALX_REQUIRED="test"
 
-inherit cmake fortran-2
+inherit cmake fortran-2 virtualx
 
 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
 HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
@@ -16,8 +17,9 @@ LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="examples high-level plplot static-libs"
+IUSE="examples high-level plplot static-libs test"
 REQUIRED_USE="plplot? ( high-level )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	x11-libs/gtk+:3
@@ -55,6 +57,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild b/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
similarity index 86%
rename from x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
rename to x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
index 3de8bf8320..1e6bf531fa 100644
--- a/x11-libs/gtk-fortran/gtk-fortran-4.1.0.ebuild
+++ b/x11-libs/gtk-fortran/gtk-fortran-4.1.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 FORTRAN_STANDARD=2003
+VIRTUALX_REQUIRED="test"
 
-inherit cmake fortran-2
+inherit cmake fortran-2 virtualx
 
 DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
 HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
@@ -16,8 +17,9 @@ LICENSE="GPL-3"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="examples high-level plplot static-libs"
+IUSE="examples high-level plplot static-libs test"
 REQUIRED_USE="plplot? ( high-level )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	gui-libs/gtk:4
@@ -55,6 +57,10 @@ src_configure() {
 	cmake_src_configure
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install