diff --git a/.travis.yml b/.travis.yml
index 339a63bb..ac30952a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,79 +1,35 @@
-language: python
+language: generic
+
+os:
+  - osx
+  - linux
+
+env:
+  - PYTHON_VERSION="2.7" JAVA_VERSION="8"
+  - PYTHON_VERSION="3.6" JAVA_VERSION="8"
+  - PYTHON_VERSION="3.7" JAVA_VERSION="8"
+  - PYTHON_VERSION="2.7" JAVA_VERSION="9"
+  - PYTHON_VERSION="3.6" JAVA_VERSION="9"
+  - PYTHON_VERSION="3.7" JAVA_VERSION="9"
+  - PYTHON_VERSION="2.7" JAVA_VERSION="10"
+  - PYTHON_VERSION="3.6" JAVA_VERSION="10"
+  - PYTHON_VERSION="3.7" JAVA_VERSION="10"
+  - PYTHON_VERSION="2.7" JAVA_VERSION="11"
+  - PYTHON_VERSION="3.6" JAVA_VERSION="11"
+  - PYTHON_VERSION="3.7" JAVA_VERSION="11"
 
 matrix:
   fast_finish: true
-  include:
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="2.7"
-        - JAVA_VERSION="8"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.6"
-        - JAVA_VERSION="8"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.7"
-        - JAVA_VERSION="8"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.7"
-        - JAVA_VERSION="8"
-        - RUN=sdist
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="2.7"
-        - JAVA_VERSION="9"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.6"
-        - JAVA_VERSION="9"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.7"
-        - JAVA_VERSION="9"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="2.7"
-        - JAVA_VERSION="10"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.6"
-        - JAVA_VERSION="10"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.7"
-        - JAVA_VERSION="10"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="2.7"
-        - JAVA_VERSION="11"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.6"
-        - JAVA_VERSION="11"
-    - language: python
-      os: linux
-      env:
-        - PYTHON_VERSION="3.7"
-        - JAVA_VERSION="11"
-
 
 install:
-  - sudo apt-get update
-  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+
+  - if [ "$TRAVIS_OS_NAME" = linux ]; then
+        sudo apt-get update;
+        MINICONDAVERSION="Linux";
+    else
+        MINICONDAVERSION="MacOSX";
+    fi;
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-$MINICONDAVERSION-x86_64.sh -O miniconda.sh
   - bash miniconda.sh -b -p $HOME/miniconda
   - echo ". $HOME/miniconda/etc/profile.d/conda.sh" >> $HOME/.bashrc
   - source $HOME/.bashrc
diff --git a/setup.py b/setup.py
index 04d15097..b7c81393 100644
--- a/setup.py
+++ b/setup.py
@@ -119,17 +119,15 @@ def compile_native_invocation_handler(*possible_homes):
         )]
     else:
         LIB_LOCATION = 'jre/lib/server/libjvm.dylib'
-
-        if isinstance(JRE_HOME, bytes):
-            JAVA_HOME = dirname(JRE_HOME.decode())
-        else:
-            JAVA_HOME = dirname(JRE_HOME)
-        FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION)
+        FULL_LIB_LOCATION = join(FRAMEWORK, LIB_LOCATION)
 
         if not exists(FULL_LIB_LOCATION):
-            # In that case, the Java version is very likely >=9.
-            # So we need to modify the `libjvm.so` path.
-            LIB_LOCATION = 'lib/server/libjvm.dylib'
+            JAVA_HOME = getenv('JAVA_HOME')
+            FULL_LIB_LOCATION = join(JAVA_HOME, LIB_LOCATION)
+            if not exists(FULL_LIB_LOCATION):
+                # In that case, the Java version is very likely >=9.
+                # So we need to modify the `libjvm.so` path.
+                LIB_LOCATION = 'lib/server/libjvm.dylib'
 
         INCLUDE_DIRS = [
             '{0}/include'.format(FRAMEWORK),
@@ -210,6 +208,10 @@ def compile_native_invocation_handler(*possible_homes):
     ]
 
     if PLATFORM == 'win32':
+
+        if isinstance(JRE_HOME, bytes):
+            JRE_HOME = JRE_HOME.decode()
+
         LIBRARY_DIRS = [
             join(JDK_HOME, 'lib'),
             join(JRE_HOME, 'bin', 'server')