diff --git a/dune-project b/dune-project
index 7fc9d1dc5..393be7cef 100644
--- a/dune-project
+++ b/dune-project
@@ -34,7 +34,7 @@ possible and does not make any assumptions about IO.
   yojson
   (ppx_yojson_conv_lib (>= "v0.14"))
   (cinaps :with-test)
-  (ppx_expect (and (>= v0.15.0) (< 0.17.0) :with-test))
+  (ppx_expect (and (>= v0.17.0) :with-test))
   (uutf (>= 1.0.2))
   (odoc :with-doc)
   (ocaml (>= 4.14))))
@@ -62,7 +62,7 @@ possible and does not make any assumptions about IO.
   spawn
   astring
   camlp-streams
-  (ppx_expect (and (>= v0.15.0) (< 0.17.0) :with-test))
+  (ppx_expect (and (>= v0.17.0) :with-test))
   (ocamlformat (and :with-test (= 0.26.2)))
   (ocamlc-loc (>= 3.7.0))
   (pp (>= 1.1.2))
diff --git a/jsonrpc-fiber/test/dune b/jsonrpc-fiber/test/dune
index 22392de46..e360e22df 100644
--- a/jsonrpc-fiber/test/dune
+++ b/jsonrpc-fiber/test/dune
@@ -12,7 +12,7 @@
   jsonrpc_fiber
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
-  ppx_expect.common
+  ppx_expect
   ppx_expect.config
   ppx_expect.config_types
   ppx_inline_test.config
diff --git a/lsp-fiber/test/dune b/lsp-fiber/test/dune
index f3bf169f8..150c99bb4 100644
--- a/lsp-fiber/test/dune
+++ b/lsp-fiber/test/dune
@@ -19,7 +19,7 @@
   lsp_fiber
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
-  ppx_expect.common
+  ppx_expect
   ppx_expect.config
   ppx_expect.config_types
   ppx_inline_test.config
diff --git a/lsp.opam b/lsp.opam
index 5d4117cff..4aadd460f 100644
--- a/lsp.opam
+++ b/lsp.opam
@@ -28,7 +28,7 @@ depends: [
   "yojson"
   "ppx_yojson_conv_lib" {>= "v0.14"}
   "cinaps" {with-test}
-  "ppx_expect" {>= "v0.15.0" & < "0.17.0" & with-test}
+  "ppx_expect" {>= "v0.17.0" & with-test}
   "uutf" {>= "1.0.2"}
   "odoc" {with-doc}
   "ocaml" {>= "4.14"}
diff --git a/lsp/test/dune b/lsp/test/dune
index f8262452e..1156aae86 100644
--- a/lsp/test/dune
+++ b/lsp/test/dune
@@ -11,7 +11,7 @@
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
   base
-  ppx_expect.common
+  ppx_expect
   ppx_expect.config
   ppx_expect.config_types
   ppx_inline_test.config)
diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
index 7d86b22f0..d1f156be0 100644
--- a/ocaml-lsp-server.opam
+++ b/ocaml-lsp-server.opam
@@ -38,7 +38,7 @@ depends: [
   "spawn"
   "astring"
   "camlp-streams"
-  "ppx_expect" {>= "v0.15.0" & < "0.17.0" & with-test}
+  "ppx_expect" {>= "v0.17.0" & with-test}
   "ocamlformat" {with-test & = "0.26.2"}
   "ocamlc-loc" {>= "3.7.0"}
   "pp" {>= "1.1.2"}
diff --git a/ocaml-lsp-server/test/dune b/ocaml-lsp-server/test/dune
index e2c3b9866..34bfff3c6 100644
--- a/ocaml-lsp-server/test/dune
+++ b/ocaml-lsp-server/test/dune
@@ -15,7 +15,7 @@
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
   base
-  ppx_expect.common
+  ppx_expect
   ppx_expect.config
   ppx_expect.config_types
   ppx_inline_test.config)
diff --git a/ocaml-lsp-server/test/e2e-new/dune b/ocaml-lsp-server/test/e2e-new/dune
index 05998f862..727ef7859 100644
--- a/ocaml-lsp-server/test/e2e-new/dune
+++ b/ocaml-lsp-server/test/e2e-new/dune
@@ -30,7 +30,7 @@
   ;; This is because of the (implicit_transitive_deps false)
   ;; in dune-project
   base
-  ppx_expect.common
+  ppx_expect
   ppx_expect.config
   ppx_expect.config_types
   ppx_inline_test.config)
diff --git a/ocaml-lsp-server/test/e2e-new/with_ppx.ml b/ocaml-lsp-server/test/e2e-new/with_ppx.ml
index 8da004358..30181353b 100644
--- a/ocaml-lsp-server/test/e2e-new/with_ppx.ml
+++ b/ocaml-lsp-server/test/e2e-new/with_ppx.ml
@@ -76,7 +76,7 @@ let%expect_test "with-ppx" =
     Received 0 diagnostics
     {
       "contents": {
-        "value": "(* ppx expect expansion *)\nExpect_test_collector.Current_file.unset ()",
+        "value": "(* ppx expect expansion *)\nPpx_expect_runtime.Current_file.unset ()",
         "language": "ocaml"
       },
       "range": {
diff --git a/submodules/lev/lev-fiber-csexp/test/dune b/submodules/lev/lev-fiber-csexp/test/dune
index 0d144a3c7..2bbfcf47d 100644
--- a/submodules/lev/lev-fiber-csexp/test/dune
+++ b/submodules/lev/lev-fiber-csexp/test/dune
@@ -13,7 +13,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests)
diff --git a/submodules/lev/lev-fiber/test/dune b/submodules/lev/lev-fiber/test/dune
index fb24190ea..441635ffc 100644
--- a/submodules/lev/lev-fiber/test/dune
+++ b/submodules/lev/lev-fiber/test/dune
@@ -11,7 +11,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests)
diff --git a/submodules/lev/lev-fiber/test/util/dune b/submodules/lev/lev-fiber/test/util/dune
index e903c60fe..2929abb75 100644
--- a/submodules/lev/lev-fiber/test/util/dune
+++ b/submodules/lev/lev-fiber/test/util/dune
@@ -9,7 +9,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests)
diff --git a/submodules/lev/lev/test/dune b/submodules/lev/lev/test/dune
index e4b014b71..5bc7a911b 100644
--- a/submodules/lev/lev/test/dune
+++ b/submodules/lev/lev/test/dune
@@ -7,7 +7,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests)
@@ -23,7 +23,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests
@@ -42,7 +42,7 @@
   ;; in dune-project
   ppx_expect.config
   ppx_expect.config_types
-  ppx_expect.common
+  ppx_expect
   base
   ppx_inline_test.config)
  (inline_tests