diff --git a/dev-ml/tuntap/files/tuntap-2.0.0-ounit2.patch b/dev-ml/tuntap/files/tuntap-2.0.0-ounit2.patch
new file mode 100644
index 0000000000..e52b097691
--- /dev/null
+++ b/dev-ml/tuntap/files/tuntap-2.0.0-ounit2.patch
@@ -0,0 +1,25 @@
+diff --git a/test/dune b/test/dune
+index 951a008..9d86605 100644
+--- a/test/dune
++++ b/test/dune
+@@ -1,6 +1,6 @@
+ (executables
+  (names getifaddrs_test nonblock_read open_close_test set_ipv4_test nonblock_test sendfd_test)
+- (libraries lwt.unix tuntap macaddr ipaddr oUnit))
++ (libraries lwt.unix tuntap macaddr ipaddr ounit2))
+ 
+ (alias
+  (name    runtest)
+diff --git a/tuntap.opam b/tuntap.opam
+index 08002b2..87148c1 100644
+--- a/tuntap.opam
++++ b/tuntap.opam
+@@ -27,7 +27,7 @@ depends: [
+   "ipaddr" {>= "5.0.0"}
+   "macaddr" {>= "4.0.0"}
+   "cmdliner"
+-  "ounit" {with-test}
++  "ounit2" {with-test}
+   "lwt" {with-test & >= "5.0.0"}
+ ]
+ build: [
diff --git a/dev-ml/tuntap/tuntap-2.0.0.ebuild b/dev-ml/tuntap/tuntap-2.0.0.ebuild
index de13a22e9f..4967472387 100644
--- a/dev-ml/tuntap/tuntap-2.0.0.ebuild
+++ b/dev-ml/tuntap/tuntap-2.0.0.ebuild
@@ -8,20 +8,26 @@ inherit dune
 MY_P="${PN}-v${PV}"
 
 DESCRIPTION="Bindings to UNIX tuntap facilities"
-HOMEPAGE="https://github.com/mirage/ocaml-tuntap"
+HOMEPAGE="
+	https://github.com/mirage/ocaml-tuntap
+	https://opam.ocaml.org/packages/tuntap/
+"
 SRC_URI="https://github.com/mirage/ocaml-${PN}/releases/download/v${PV}/${MY_P}.tbz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="ocamlopt"
+IUSE="ocamlopt test"
 
 RDEPEND="
-	dev-ml/cmdliner
-	dev-ml/ipaddr
+	dev-ml/cmdliner:=
+	>=dev-ml/ipaddr-5.0.0:=
 "
 DEPEND="
 	${RDEPEND}
 	sys-kernel/linux-headers
+	test? ( >=dev-ml/lwt-5.0.0 )
 "
+
+RESTRICT="!test? ( test )"