diff --git a/.travis.yml b/.travis.yml
index b92aa50c2..a7cf2e9fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,6 +84,13 @@ jobs:
         - MB_PYTHON_VERSION=3.8
         - PLAT=i686
 
+    - name: "3.6 macOS PyPy"
+      os: osx
+      osx_image: xcode9.3
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=pypy3.6-7.3
+        - MB_PYTHON_OSX_VER=10.9
     - name: "3.6 Xenial 64-bit PyPy"
       os: linux
       env:
@@ -167,6 +174,14 @@ jobs:
         - PLAT=i686
         - LATEST="true"
 
+    - name: "3.6 macOS PyPy latest"
+      os: osx
+      osx_image: xcode9.3
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=pypy3.6-7.3
+        - MB_PYTHON_OSX_VER=10.9
+        - LATEST="true"
     - name: "3.6 Xenial 64-bit PyPy latest"
       os: linux
       env:
diff --git a/config.sh b/config.sh
index 1ce61ed76..26b647b05 100644
--- a/config.sh
+++ b/config.sh
@@ -27,6 +27,12 @@ function pre_build {
         build_new_zlib
     fi
 
+    if [ -n "$IS_OSX" ]; then
+        ORIGINAL_BUILD_PREFIX=$BUILD_PREFIX
+        ORIGINAL_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+        BUILD_PREFIX=`dirname $(dirname $(which python))`
+        PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig"
+    fi
     build_simple xcb-proto $LIBXCB_VERSION https://xcb.freedesktop.org/dist
     if [ -n "$IS_OSX" ]; then
         build_simple xproto 7.0.31 https://www.x.org/pub/individual/proto
@@ -36,6 +42,10 @@ function pre_build {
         sed -i s/\${pc_sysrootdir\}// /usr/local/lib/pkgconfig/xcb-proto.pc
     fi
     build_simple libxcb $LIBXCB_VERSION https://xcb.freedesktop.org/dist
+    if [ -n "$IS_OSX" ]; then
+        BUILD_PREFIX=$ORIGINAL_BUILD_PREFIX
+        PKG_CONFIG_PATH=$ORIGINAL_PKG_CONFIG_PATH
+    fi
     
     # Custom flags to include both multibuild and jpeg defaults
     ORIGINAL_CFLAGS=$CFLAGS