diff --git a/dev-ml/xenstore/files/xenstore-2.1.1-ounit2.patch b/dev-ml/xenstore/files/xenstore-2.1.1-ounit2.patch
new file mode 100644
index 0000000000..a57254dfeb
--- /dev/null
+++ b/dev-ml/xenstore/files/xenstore-2.1.1-ounit2.patch
@@ -0,0 +1,37 @@
+diff --git a/core_test/dune b/core_test/dune
+index 5ad5e2a..cfc32d3 100644
+--- a/core_test/dune
++++ b/core_test/dune
+@@ -1,6 +1,6 @@
+ (executables
+  (names xs_test)
+- (libraries lwt lwt.unix xenstore oUnit)
++ (libraries lwt lwt.unix xenstore ounit2)
+  (flags :standard -safe-string))
+ 
+ (alias
+diff --git a/server_test/dune b/server_test/dune
+index a281f54..a161646 100644
+--- a/server_test/dune
++++ b/server_test/dune
+@@ -1,6 +1,6 @@
+ (executables
+  (names server_test)
+- (libraries lwt lwt.unix xenstore xenstore.server oUnit)
++ (libraries lwt lwt.unix xenstore xenstore.server ounit2)
+  (flags :standard -safe-string))
+ 
+ (alias
+diff --git a/xenstore.opam b/xenstore.opam
+index 4a598e0..f1606bf 100644
+--- a/xenstore.opam
++++ b/xenstore.opam
+@@ -17,7 +17,7 @@ depends: [
+   "cstruct" {>= "3.2.0"}
+   "ppx_cstruct" {>= "3.2.0"}
+   "lwt"
+-  "ounit" {with-test}
++  "ounit2" {with-test}
+ ]
+ build: [
+   ["dune" "subst"] {pinned}
diff --git a/dev-ml/xenstore/xenstore-2.1.1.ebuild b/dev-ml/xenstore/xenstore-2.1.1.ebuild
index c33acdfd8a..3e8a0a9f5a 100644
--- a/dev-ml/xenstore/xenstore-2.1.1.ebuild
+++ b/dev-ml/xenstore/xenstore-2.1.1.ebuild
@@ -6,16 +6,25 @@ EAPI=8
 inherit dune
 
 DESCRIPTION="A Xenstore protocol implementation in pure OCaml"
-HOMEPAGE="https://github.com/mirage/ocaml-xenstore"
+HOMEPAGE="
+	https://github.com/mirage/ocaml-xenstore
+	https://opam.ocaml.org/packages/xenstore/xenstore.2.0.0/
+"
 SRC_URI="https://github.com/mirage/ocaml-${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="ocamlopt"
+IUSE="ocamlopt test"
 
-DEPEND="
-	dev-ml/cstruct
-	dev-ml/lwt
+RDEPEND="
+	dev-ml/cstruct:=
+	dev-ml/lwt:=
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit2 )
+"
+
+RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"