diff --git a/.gitignore b/.gitignore
index a14bea44..8bae792d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ _build
 *.install
 .merlin
 _tests/
+_opam
diff --git a/alcotest-async.descr b/alcotest-async.descr
deleted file mode 100644
index 95da3d94..00000000
--- a/alcotest-async.descr
+++ /dev/null
@@ -1 +0,0 @@
-Async-based helpers for Alcotest.
diff --git a/alcotest-async.opam b/alcotest-async.opam
index e0fec409..7dd1942f 100644
--- a/alcotest-async.opam
+++ b/alcotest-async.opam
@@ -1,8 +1,8 @@
-opam-version: "1.2"
-maintainer: "thomas@gazagnaire.org"
+opam-version: "2.0"
+maintainer:  "thomas@gazagnaire.org"
 authors:     "Thomas Gazagnaire"
 homepage:    "https://github.com/mirage/alcotest/"
-dev-repo:    "https://github.com/mirage/alcotest.git"
+dev-repo:    "git+https://github.com/mirage/alcotest.git"
 bug-reports: "https://github.com/mirage/alcotest/issues/"
 license:     "ISC"
 doc:         "https://mirage.github.io/alcotest/"
@@ -10,13 +10,15 @@ doc:         "https://mirage.github.io/alcotest/"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-build-test: ["dune" "runtest" "-p" name "-j" jobs]
 
 depends: [
   "dune"  {build}
+  "ocaml" {>= "4.03.0"}
   "alcotest"
   "async_unix" {>= "v0.9.0"}
   "core_kernel" {>= "v0.9.0"}
 ]
-available: [ocaml-version >= "4.03.0"]
+
+synopsis: "Async-based helpers for Alcotest"
diff --git a/alcotest-lwt.descr b/alcotest-lwt.descr
deleted file mode 100644
index 8cd75269..00000000
--- a/alcotest-lwt.descr
+++ /dev/null
@@ -1 +0,0 @@
-Lwt-based helpers for Alcotest.
diff --git a/alcotest-lwt.opam b/alcotest-lwt.opam
index dccdddbc..999e5ad1 100644
--- a/alcotest-lwt.opam
+++ b/alcotest-lwt.opam
@@ -1,8 +1,8 @@
-opam-version: "1.2"
-maintainer: "thomas@gazagnaire.org"
+opam-version: "2.0"
+maintainer:  "thomas@gazagnaire.org"
 authors:     "Thomas Gazagnaire"
 homepage:    "https://github.com/mirage/alcotest/"
-dev-repo:    "https://github.com/mirage/alcotest.git"
+dev-repo:    "git+https://github.com/mirage/alcotest.git"
 bug-reports: "https://github.com/mirage/alcotest/issues/"
 license:     "ISC"
 doc:         "https://mirage.github.io/alcotest/"
@@ -10,12 +10,14 @@ doc:         "https://mirage.github.io/alcotest/"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-build-test: ["dune" "runtest" "-p" name "-j" jobs]
 
 depends: [
   "dune"  {build}
+  "ocaml" {>= "4.02.3"}
   "alcotest"
   "lwt" "logs"
 ]
-available: [ocaml-version >= "4.02.3"]
+
+synopsis: "Lwt-based helpers for Alcotest"
diff --git a/alcotest.descr b/alcotest.descr
deleted file mode 100644
index bb2425ec..00000000
--- a/alcotest.descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Alcotest is a lightweight and colourful test framework.
-
-Alcotest exposes simple interface to perform unit tests. It exposes
-a simple TESTABLE module type, a check function to assert test
-predicates and a run function to perform a list of unit -> unit
-test callbacks.
-
-Alcotest provides a quiet and colorful output where only faulty runs
-are fully displayed at the end of the run (with the full logs ready to
-inspect), with a simple (yet expressive) query language to select the
-tests to run.
diff --git a/alcotest.opam b/alcotest.opam
index c17ad05f..0d15cb08 100644
--- a/alcotest.opam
+++ b/alcotest.opam
@@ -1,8 +1,8 @@
-opam-version: "1.2"
-maintainer: "thomas@gazagnaire.org"
+opam-version: "2.0"
+maintainer:  "thomas@gazagnaire.org"
 authors:     "Thomas Gazagnaire"
 homepage:    "https://github.com/mirage/alcotest/"
-dev-repo:    "https://github.com/mirage/alcotest.git"
+dev-repo:    "git+https://github.com/mirage/alcotest.git"
 bug-reports: "https://github.com/mirage/alcotest/issues/"
 license:     "ISC"
 doc:         "https://mirage.github.io/alcotest/"
@@ -10,15 +10,29 @@ doc:         "https://mirage.github.io/alcotest/"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-build-test: ["dune" "runtest" "-p" name "-j" jobs]
 
 depends: [
   "dune"  {build & >= "1.1.0"}
+  "ocaml" {>= "4.02.3"}
   "fmt"   {>= "0.8.0"}
   "astring"
   "result"
   "cmdliner"
   "uuidm"
 ]
-available: [ocaml-version >= "4.02.3"]
+
+synopsis: "Alcotest is a lightweight and colourful test framework"
+
+description: """
+Alcotest exposes simple interface to perform unit tests. It exposes
+a simple TESTABLE module type, a check function to assert test
+predicates and a run function to perform a list of unit -> unit
+test callbacks.
+
+Alcotest provides a quiet and colorful output where only faulty runs
+are fully displayed at the end of the run (with the full logs ready to
+inspect), with a simple (yet expressive) query language to select the
+tests to run.
+"""