diff --git a/opam b/opam
index b7afc795..9a7799ff 100644
--- a/opam
+++ b/opam
@@ -1,7 +1,7 @@
-opam-version: "1.2"
+opam-version: "2.0"
 name:         "tls"
 homepage:     "https://github.com/mirleft/ocaml-tls"
-dev-repo:     "https://github.com/mirleft/ocaml-tls.git"
+dev-repo:     "git+https://github.com/mirleft/ocaml-tls.git"
 bug-reports:  "https://github.com/mirleft/ocaml-tls/issues"
 doc:          "https://mirleft.github.io/ocaml-tls/doc"
 author:       ["David Kaloper <david@numm.org>" "Hannes Mehnert <hannes@mehnert.org>"]
@@ -12,15 +12,14 @@ build: [
   [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "false"
     "--with-lwt" "%{lwt+ptime:installed}%"
     "--with-mirage" "%{mirage-flow-lwt+mirage-kv-lwt+mirage-clock+ptime:installed}%" ]
-]
-build-test: [
   ["ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%" "--tests" "true"
     "--with-lwt" "%{lwt+ptime+astring:installed}%"
-    "--with-mirage" "%{mirage-flow-lwt+mirage-kv-lwt+mirage-clock+ptime:installed}%" ]
-  ["ocaml" "pkg/pkg.ml" "test"]
+    "--with-mirage" "%{mirage-flow-lwt+mirage-kv-lwt+mirage-clock+ptime:installed}%" ] {with-test}
+  ["ocaml" "pkg/pkg.ml" "test"] {with-test}
 ]
 
 depends: [
+  "ocaml" {>= "4.02.2"}
   "ocamlfind" {build}
   "ocamlbuild" {build}
   "topkg" {build}
@@ -32,8 +31,8 @@ depends: [
   "sexplib"
   "nocrypto" {>= "0.5.4"}
   "x509" {>= "0.6.1"}
-  "cstruct-unix" {test & >= "3.0.0"}
-  "ounit" {test}
+  "cstruct-unix" {with-test & >= "3.0.0"}
+  "ounit" {with-test}
 ]
 depopts: [
   "lwt"
@@ -41,7 +40,7 @@ depopts: [
   "mirage-kv-lwt"
   "mirage-clock"
   "ptime"
-  "astring" {test}
+  "astring" {with-test}
 ]
 conflicts: [
   "lwt" {<"2.4.8"}
@@ -53,4 +52,4 @@ conflicts: [
 ]
 
 tags: [ "org:mirage"]
-available: [ ocaml-version >= "4.02.2" ]
+synopsis: "Transport Layer Security purely in OCaml"
\ No newline at end of file