diff --git a/.github/workflows/js_of_ocaml.yml b/.github/workflows/js_of_ocaml.yml
index 19c8c76af1..8bad42ead5 100644
--- a/.github/workflows/js_of_ocaml.yml
+++ b/.github/workflows/js_of_ocaml.yml
@@ -25,6 +25,7 @@ jobs:
           - "5.0"
           - "5.1"
           - "5.2"
+          - "5.3"
         skip-test:
           - true
         skip-doc:
@@ -59,7 +60,7 @@ jobs:
             skip-doc: true
           - os: ubuntu-latest
             os-name: Ubuntu
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             skip-effects: false
             skip-test: false
             skip-doc: false
@@ -72,31 +73,24 @@ jobs:
             # Note this OCaml compiler is bytecode only
           - os: ubuntu-latest
             os-name: Ubuntu
-            ocaml-name: "5.3.0+32bit"
-            ocaml-compiler: "ocaml-variants.5.3.0+options,ocaml-option-32bit"
+            ocaml-name: "5.4.0+32bit"
+            ocaml-compiler: "ocaml-variants.5.4.0+options,ocaml-option-32bit"
             skip-effects: true # disabled for the same reason than `skip-test`
             skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :(
             skip-doc: true
           - os: macos-latest
             os-name: MacOS
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             skip-effects: true
             skip-test: false
             skip-doc: true
           - os: windows-latest
             os-name: Windows
-            ocaml-compiler: "5.3"
+            ocaml-compiler: "5.4"
             skip-effects: false
             skip-test: false
             skip-doc: true
-          - os: ubuntu-latest
-            os-name: Ubuntu
-            ocaml-name: "5.4-alpha1"
-            ocaml-compiler: "ocaml-compiler.5.4.0~alpha1"
-            skip-effects: true
-            skip-test: true
-            skip-doc: true
-
+ 
     runs-on: ${{ matrix.os }}
 
     name:
diff --git a/.github/workflows/wasm_of_ocaml.yml b/.github/workflows/wasm_of_ocaml.yml
index c964c54c30..c8d318a3db 100644
--- a/.github/workflows/wasm_of_ocaml.yml
+++ b/.github/workflows/wasm_of_ocaml.yml
@@ -26,6 +26,7 @@ jobs:
           - "5.0"
           - "5.1"
           - "5.2"
+          - "5.4"
         separate_compilation:
           - true
         jane_street_tests:
@@ -123,7 +124,7 @@ jobs:
         run: |
           opam repo add js janestreet/opam-repository
           opam install opam-format
-          opam pin add ppxlib -n 0.35.0
+          opam pin add ppxlib -n 0.37.0~5.4preview
           opam exec -- dune exec --root wasm_of_ocaml tools/ci_setup.exe
 
       - name: Pin Jane Street packages
diff --git a/compiler/tests-ocaml/lib-list/test.ml b/compiler/tests-ocaml/lib-list/test.ml
index 227c454775..6f56e35365 100644
--- a/compiler/tests-ocaml/lib-list/test.ml
+++ b/compiler/tests-ocaml/lib-list/test.ml
@@ -68,13 +68,13 @@ let () =
   assert (List.take 3 [1; 2; 3; 4; 5] = [1; 2; 3]);
   assert (List.take 3 [1; 2] = [1; 2]);
   assert (List.take 3 [] = []);
-  assert ((try List.take (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]);
+  assert (List.take (-1) [1; 2] = []);
   assert (List.take 0 [1; 2] = []);
   assert (List.drop 6 hello_world = world);
   assert (List.drop 3 [1; 2; 3; 4; 5] = [4; 5]);
   assert (List.drop 3 [1; 2] = []);
   assert (List.drop 3 [] = []);
-  assert ((try List.drop (-1) [1; 2] with Invalid_argument _ -> [999]) = [999]);
+  assert (List.drop (-1) [1; 2] = [1; 2]);
   assert (List.drop 0 [1; 2] = [1; 2]);
   assert (List.take_while (fun x -> x < 3) [1; 2; 3; 4; 1; 2; 3; 4]
           = [1; 2]);
diff --git a/compiler/tests-toplevel/test_toplevel.expected b/compiler/tests-toplevel/test_toplevel.expected
index 81e85b3449..c6e778709b 100644
--- a/compiler/tests-toplevel/test_toplevel.expected
+++ b/compiler/tests-toplevel/test_toplevel.expected
@@ -2,6 +2,6 @@ hello
 - : int = 2
 Line 4, characters 2-4:
 Error: Syntax error
-Line 5, characters 0-16:
-Error: Unbound module "Missing_module"
+Line 5, characters 0-14:
+Error: Unbound module Missing_module
 val y : float = 0.333333333333333315
diff --git a/dune-project b/dune-project
index 676fe82cb9..438a5163a6 100644
--- a/dune-project
+++ b/dune-project
@@ -20,7 +20,7 @@
   (ocaml (and (>= 4.13) (< 5.5)))
   (num :with-test)
   (ppx_expect (and (>= v0.16.1) :with-test))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (re :with-test)
   (cmdliner (>= 1.1.0))
   (sedlex (>= 3.3))
@@ -62,7 +62,7 @@
  (depends
   (ocaml (>= 4.13))
   (js_of_ocaml (= :version))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
   (re (and (>= 1.9.0) :with-test))
@@ -76,7 +76,7 @@
  (depends
   (ocaml (>= 4.13))
   (js_of_ocaml (= :version))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
   (re (and (>= 1.9.0) :with-test))
@@ -95,7 +95,7 @@
   (graphics :with-test)
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (re (and (>= 1.9.0) :with-test))
 ))
 
@@ -126,7 +126,7 @@
   (js_of_ocaml-compiler (= :version))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (re (and (>= 1.9.0) :with-test))
 ))
 
@@ -140,7 +140,7 @@
   (js_of_ocaml (= :version))
   (num :with-test)
   (ppx_expect (and (>= v0.14.2) :with-test))
-  (ppxlib (>= 0.35))
+  (ppxlib (>= 0.36))
   (re :with-test)
   (cmdliner (>= 1.1.0))
   (opam-format :with-test)
diff --git a/js_of_ocaml-compiler.opam b/js_of_ocaml-compiler.opam
index 98e4e00b15..8684fa88cc 100644
--- a/js_of_ocaml-compiler.opam
+++ b/js_of_ocaml-compiler.opam
@@ -16,7 +16,7 @@ depends: [
   "ocaml" {>= "4.13" & < "5.5"}
   "num" {with-test}
   "ppx_expect" {>= "v0.16.1" & with-test}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "re" {with-test}
   "cmdliner" {>= "1.1.0"}
   "sedlex" {>= "3.3"}
diff --git a/js_of_ocaml-ppx.opam b/js_of_ocaml-ppx.opam
index 65872d8ecf..42e0d7e124 100644
--- a/js_of_ocaml-ppx.opam
+++ b/js_of_ocaml-ppx.opam
@@ -15,7 +15,7 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
   "re" {>= "1.9.0" & with-test}
diff --git a/js_of_ocaml-ppx_deriving_json.opam b/js_of_ocaml-ppx_deriving_json.opam
index 65872d8ecf..42e0d7e124 100644
--- a/js_of_ocaml-ppx_deriving_json.opam
+++ b/js_of_ocaml-ppx_deriving_json.opam
@@ -15,7 +15,7 @@ depends: [
   "dune" {>= "3.19"}
   "ocaml" {>= "4.13"}
   "js_of_ocaml" {= version}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
   "re" {>= "1.9.0" & with-test}
diff --git a/js_of_ocaml-toplevel.opam b/js_of_ocaml-toplevel.opam
index 6244f14f77..ab30511e77 100644
--- a/js_of_ocaml-toplevel.opam
+++ b/js_of_ocaml-toplevel.opam
@@ -19,7 +19,7 @@ depends: [
   "graphics" {with-test}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]
diff --git a/js_of_ocaml.opam b/js_of_ocaml.opam
index 6a04b51e3f..67c39d81d5 100644
--- a/js_of_ocaml.opam
+++ b/js_of_ocaml.opam
@@ -17,7 +17,7 @@ depends: [
   "js_of_ocaml-compiler" {= version}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "re" {>= "1.9.0" & with-test}
   "odoc" {with-doc}
 ]
diff --git a/wasm_of_ocaml-compiler.opam b/wasm_of_ocaml-compiler.opam
index 1a2af784a3..c60c3cb0f6 100644
--- a/wasm_of_ocaml-compiler.opam
+++ b/wasm_of_ocaml-compiler.opam
@@ -17,7 +17,7 @@ depends: [
   "js_of_ocaml" {= version}
   "num" {with-test}
   "ppx_expect" {>= "v0.14.2" & with-test}
-  "ppxlib" {>= "0.35"}
+  "ppxlib" {>= "0.36"}
   "re" {with-test}
   "cmdliner" {>= "1.1.0"}
   "opam-format" {with-test}