diff --git a/.travis.yml b/.travis.yml
index e204e4d..2c328d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,12 @@ matrix:
   - os: osx
     python: 2.7
     env: TRAVIS_PYTHON_VERSION=2.7
+  - os: linux
+    python: 3.7
+    env: TRAVIS_PYTHON_VERSION=3.7
+  - os: osx
+    python: 3.7
+    env: TRAVIS_PYTHON_VERSION=3.7
 before_install:
 - |
   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
diff --git a/ci/build_and_test.sh b/ci/build_and_test.sh
index de0321d..fc39139 100755
--- a/ci/build_and_test.sh
+++ b/ci/build_and_test.sh
@@ -20,9 +20,9 @@ if $UPDATE_CONDA ; then
     conda update --yes -q conda conda-build
 fi
 
-if [[ ${TRAVIS_OS_NAME} == osx ]];
+if [[ ${TRAVIS_PYTHON_VERSION} == 2.7 ]];
 then
-    conda config --add channels $conda_channel
+    READLINE="readline=${READLINE_VERSION}"
 fi
 
 # Answer yes to all questions (non-interactive)
@@ -34,7 +34,7 @@ conda config --set anaconda_upload no
 # Create test environment
 echo " ======================>  Creating the test environment..."
 
-conda create --yes --name $ENVNAME -c $conda_channel python=$TRAVIS_PYTHON_VERSION readline=${READLINE_VERSION}
+conda create --yes --name $ENVNAME -c $conda_channel python=$TRAVIS_PYTHON_VERSION ${READLINE}
 #libgfortran=${LIBGFORTRAN_VERSION}
 
 # Make sure conda-forge is the first channel
@@ -70,6 +70,9 @@ fi
 echo "======> installing..."
 conda install --use-local -c $conda_channel xspec-modelsonly
 
+# TEMP
+conda search xspec-modelsonly --use-local --info
+
 # UPLOAD TO CONDA:
 # If we are on the master branch upload to the channel
 if [[ "${TRAVIS_EVENT_TYPE}" == "pull_request" ]]; then
@@ -81,9 +84,9 @@ else
             conda install -c conda-forge anaconda-client
             echo "Uploading..."
             if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-                anaconda -q -t $CONDA_UPLOAD_TOKEN upload -u threeml /home/travis/miniconda/conda-bld/linux-64/*.tar.bz2 --force
+                anaconda -q -t $CONDA_UPLOAD_TOKEN upload -u xspecmodels /home/travis/miniconda/conda-bld/linux-64/*.tar.bz2 --force
             else
-                anaconda -q -t $CONDA_UPLOAD_TOKEN upload -u threeml /Users/travis/miniconda/conda-bld/*/*.tar.bz2 --force
+                anaconda -q -t $CONDA_UPLOAD_TOKEN upload -u xspecmodels /Users/travis/miniconda/conda-bld/*/*.tar.bz2 --force
             fi
         fi
     fi
diff --git a/conda_recipe/xspec-modelsonly/meta.yaml b/conda_recipe/xspec-modelsonly/meta.yaml
index 76cca1b..e3a9a49 100644
--- a/conda_recipe/xspec-modelsonly/meta.yaml
+++ b/conda_recipe/xspec-modelsonly/meta.yaml
@@ -20,8 +20,10 @@ requirements:
       - {{ compiler('cxx') }} # [linux]
       - {{ compiler('fortran') }} # [linux]
       - libgfortran>=3.0,<4.0
-      - ncurses==5.9
-      - readline==6.2
+      - ncurses==5.9 # [py2k]
+      - ncurses # [py3k]
+      - readline==6.2 # [py2k]
+      - readline # [py3k]
       - toolchain==2.1.2
       - wcslib==5.18
     run:
@@ -29,8 +31,10 @@ requirements:
       - cfitsio==3.410
       - wcslib==5.18
       - libgfortran
-      - ncurses==5.9
-      - readline==6.2
+      - ncurses==5.9 # [py2k]
+      - ncurses # [py3k]
+      - readline==6.2 # [py2k]
+      - readline # [py3k]
 
 # Note that ncurses is only needed to build but I am not
 # sure it's needed at all at run-time. To keep things