diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5ae539cb01..d2f134fc44 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,6 +16,8 @@ on:
 jobs:
   # This workflow contains a single job called "build"
   build:
+    env: 
+     OPAM_VERSION: 2.1.0-alpha
     strategy:
       fail-fast: false
       matrix:
@@ -32,7 +34,10 @@ jobs:
           - 4.08.1
           - 4.09.1
           - 4.10.1
-          - 4.11.0
+          - 4.11.1
+        include:
+          - os: macos-latest
+            ocaml-version: 4.11.1
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
 
@@ -55,7 +60,7 @@ jobs:
 
       - run: opam pin add merlin.dev . --no-action
       - run: opam pin add dot-merlin-reader.dev . --no-action
-      - run: opam depext merlin --yes --with-test
+      - run: opam depext conf-jq --yes # merlin --yes --with-test # opam depext bug
       - run: opam install . --deps-only --with-test
       - run: opam install menhir
       - run: opam exec -- dune build
diff --git a/.travis.yml b/.travis.yml
index a600f0ef9c..d6240308da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: c
-sudo: true
 dist: xenial
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
 script: |
@@ -8,27 +7,15 @@ env:
   global:
   - EXTRA_DEPS="dot-merlin-reader"
   - PINS="dot-merlin-reader.dev:."
+  - ASSUME_ALWAYS_YES=YES
   matrix:
-  - OCAML_VERSION=4.02
-    PACKAGE=merlin
-    TESTS=false
-  - OCAML_VERSION=4.03
-    PACKAGE=merlin
-  # - OCAML_VERSION=4.04
-  #   PACKAGE=merlin
-  # - OCAML_VERSION=4.05
-  #   PACKAGE=merlin
-  # - OCAML_VERSION=4.06
-  #   PACKAGE=merlin
-  # - OCAML_VERSION=4.07
-  #   PACKAGE=merlin
-  - OCAML_VERSION=4.08
-    PACKAGE=merlin
-  - OCAML_VERSION=4.09
-    PACKAGE=merlin
-  - OCAML_VERSION=4.10
-    PACKAGE=merlin
   - OCAML_VERSION=4.11
     PACKAGE=merlin
 os:
   - linux
+  - osx
+  - freebsd
+jobs:
+  include:
+  - os: linux
+    env: OCAML_VERSION=4.02 PACKAGE=merlin TESTS=false
diff --git a/merlin.opam b/merlin.opam
index 99a2efb51b..818e35dcd2 100644
--- a/merlin.opam
+++ b/merlin.opam
@@ -7,7 +7,7 @@ dev-repo: "git+https://github.com/ocaml/merlin.git"
 build: [
   ["dune" "subst"] {pinned}
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name "-j" "1"] {with-test & os != "macos" & ocaml:version >= "4.03"}
+  ["dune" "runtest" "-p" name "-j" "1"] {with-test & ocaml:version >= "4.03"}
 ]
 depends: [
   "ocaml" {>= "4.02.3" & < "4.12"}
diff --git a/tests/merlin-wrapper-template b/tests/merlin-wrapper-template
index 0c90d45f14..43932c7342 100755
--- a/tests/merlin-wrapper-template
+++ b/tests/merlin-wrapper-template
@@ -1,21 +1,15 @@
 #!/usr/bin/env bash
 
-sed="sed"
-uname=$(uname -s)
-if [ "$uname" == "Darwin" ]; then
-    sed="gsed"
-fi;
-
 export PATH=$(dirname %%DOT_MERLIN_READER%%):$PATH
 
 src_dir="$(dirname ${BASH_SOURCE[0]})/.."
 cd "$src_dir"
-src_dir=$(realpath -e $(pwd) 2>/dev/null || readlink -f $(pwd))
+src_dir=$(pwd -P)
 cd - > /dev/null
 $(dirname ${BASH_SOURCE[0]})/%%OCAMLMERLIN_PATH%% "$@" \
     | jq 'del(.timing)' \
-    | $sed -e "s:$src_dir/::g" \
-    | $sed -e 's:"[^"]*lib/ocaml:"lib/ocaml:g' \
-    | $sed -e 's:"/.*/\(\.opam\|opam2\)/[^/]*/\([^"]*\)":"~opam/\2":g' \
-    | $sed -e 's:\\n:\
+    | sed -e "s:$src_dir/::g" \
+    | sed -e 's:"[^"]*lib/ocaml:"lib/ocaml:g' \
+    | sed -e 's:"/.*/\(\.opam\|opam2\)/[^/]*/\([^"]*\)":"~opam/\2":g' \
+    | sed -e 's:\\n:\
 :g'