diff --git a/.travis.yml b/.travis.yml
index 2b71111..92e64f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,18 @@
 language: c
-install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
-sudo: required
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+script: bash -ex .travis-docker.sh
+sudo: false
+services:
+  - docker
 env:
   global:
     - PACKAGE="mirage-kv-mem"
+    - DISTRO=alpine
+    - TESTS=true
   matrix:
-    - OCAML_VERSION=4.05
     - OCAML_VERSION=4.06
     - OCAML_VERSION=4.07
+    - OCAML_VERSION=4.08
+    - OCAML_VERSION=4.09
 notifications:
   email: false
diff --git a/mirage-kv-mem.opam b/mirage-kv-mem.opam
index f047958..3ced793 100644
--- a/mirage-kv-mem.opam
+++ b/mirage-kv-mem.opam
@@ -21,16 +21,16 @@ build: [
 ]
 
 depends: [
-  "ocaml" {>= "4.05.0"}
-  "dune"
+  "ocaml" {>= "4.06.0"}
+  "dune" {>= "1.3.0"}
   "alcotest" {with-test}
   "ppx_deriving" {with-test}
-  "mirage-clock" {>= "2.0.0"}
-  "mirage-kv-lwt" {>= "2.0.0"}
+  "mirage-clock" {>= "3.0.0"}
+  "mirage-kv" {>= "3.0.0"}
   "rresult"
   "fmt"
   "ptime"
-  "mirage-clock-unix" {>= "2.0.0"}
+  "mirage-clock-unix" {>= "3.0.0"}
 ]
 
 synopsis: "In-memory key value store for MirageOS"
diff --git a/src/dune b/src/dune
index 78cab69..172056f 100644
--- a/src/dune
+++ b/src/dune
@@ -1,4 +1,4 @@
 (library
   (name mirage_kv_mem)
   (public_name mirage-kv-mem)
-  (libraries mirage-kv-lwt rresult fmt ptime mirage-clock))
+  (libraries mirage-kv rresult fmt ptime mirage-clock))
diff --git a/src/mirage_kv_mem.ml b/src/mirage_kv_mem.ml
index aa10fac..8e81a82 100644
--- a/src/mirage_kv_mem.ml
+++ b/src/mirage_kv_mem.ml
@@ -114,8 +114,6 @@ module Pure = struct
 end
 
 module Make (CLOCK : Mirage_clock.PCLOCK) = struct
-  type +'a io = 'a Lwt.t
-  type value = string
   type key = Mirage_kv.Key.t
 
   [@@@warning "-34"]
diff --git a/src/mirage_kv_mem.mli b/src/mirage_kv_mem.mli
index 01ac3a4..6deb5b4 100644
--- a/src/mirage_kv_mem.mli
+++ b/src/mirage_kv_mem.mli
@@ -23,7 +23,7 @@ module Make (Clock : Mirage_clock.PCLOCK) : sig
   type nonrec error = error
   type nonrec write_error = write_error
 
-  include Mirage_kv_lwt.RW
+  include Mirage_kv.RW
     with type write_error := write_error
      and type error := error