diff --git a/.travis.yml b/.travis.yml
index 9d43081..1dac6c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ env:
   global:
       - REPO_DIR=pandas
       # on release change this to a version
-      - BUILD_COMMIT=v0.25.1
+      - BUILD_COMMIT=0.25.x
       - PLAT=x86_64
       - UNICODE_WIDTH=32
       - MB_PYTHON_OSX_VER=10.9
@@ -27,6 +27,19 @@ matrix:
       # Exclude the default Python 3.5 build
       - python: 3.5
   include:
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.8
+        - NP_BUILD_DEP="numpy==1.18.0.dev0"
+        - NP_TEST_DEP="numpy==1.18.0.dev0"
+
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.8
+        - NP_BUILD_DEP="numpy==1.18.0.dev0"
+        - NP_TEST_DEP="numpy==1.18.0.dev0"
+
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.5
@@ -71,10 +84,8 @@ before_install:
     - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
     - CONTAINER="wheels";  # pre-relesae
     - BUILD_COMMIT=$BUILD_COMMIT;
-    - BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython==0.28.2"
-      # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589
-      # Moto picks it up, and they don't distribute 32-bit wheels.
-    - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography"
+    - BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython"
+    - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist hypothesis"
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
     - before_install
diff --git a/config.sh b/config.sh
index b738d4b..0f8f086 100644
--- a/config.sh
+++ b/config.sh
@@ -21,6 +21,16 @@ function build_wheel {
     build_bdist_wheel $@
 }
 
+
+function pip_opts {
+    # Add pre-release index until official NumPy release with 3.8
+    if [ -n "$MANYLINUX_URL" ]; then
+        echo "--find-links $MANYLINUX_URL --find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
+    else
+        echo "--find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
+    fi
+}
+
 function run_tests {
     # Runs tests on installed distribution from an empty directory
     export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
diff --git a/multibuild b/multibuild
index e373d06..d0cf77e 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit e373d06f9aa39cd9287b75d596bba7a95b042abb
+Subproject commit d0cf77e62028704875073e3dc4626f61d1c33b0e