diff --git a/.travis.yml b/.travis.yml
index d9c8b167e..28f5aab33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: required
 language: c
 os:
   - linux
-  - osx
 services: docker
 osx_image: xcode7.3
 before_install:
diff --git a/Makefile b/Makefile
index c59fa699a..7d3b16962 100644
--- a/Makefile
+++ b/Makefile
@@ -776,7 +776,7 @@ devsetup: Makefile.autoconf
 	  echo '$(TERM_INFO)*** NOTE: The current shell is not set up for the right opam switch.$(TERM_RESET)' >&2; \
 	  echo '$(TERM_INFO)*** NOTE: Please run:$(TERM_RESET)' >&2; \
 	  echo >&2; \
-	  echo '$(TERM_INFO)  eval $$(opam config env)$(TERM_RESET)' >&2; \
+	  echo "$(TERM_INFO)  eval \$$($(OPAM) config env)$(TERM_RESET)" >&2; \
 	fi
 
 GHPAGES ?= no