diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 141af5e..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-version: 2.1
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - test-python-3:
-          filters:
-            branches:
-              ignore: master
-      - test-python-2:
-          filters:
-            branches:
-              ignore: master
-
-waitforapt: &waitforapt
-  name: Remove cloud init lock
-  command: |
-      while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 10; done
-      while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do echo 'Waiting for autoupdates to complete...'; sleep 10; done
-      echo 'Waiting for instance to really be ready...'
-      sleep 30
-      sudo rm -rf /var/lib/apt/lists/lock
-      sudo rm /var/lib/dpkg/lock && sudo dpkg --configure -a
-
-
-install_cognitiveatlas: &install_cognitiveatlas
-  name: install cognitiveatlas
-  command: |
-     $HOME/conda/bin/pip uninstall cognitiveatlas --yes || echo "Not installed"
-     $HOME/conda/bin/python setup.py install
-
-
-install_python_3: &install_python_3
-  name: install Python 3.5 dependencies
-  command: | 
-      ls $HOME
-      if [ ! -d "/home/circleci/conda" ]; then
-          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-          /bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/conda
-          export PATH=$HOME/conda/bin:$PATH
-          $HOME/conda/bin/python setup.py install
-       else
-           echo "Miniconda 3 is already installed, continuing to build."
-       fi
-
-install_python_2: &install_python_2
-  name: install Python 3.5 dependencies
-  command: | 
-      ls $HOME
-      if [ ! -d "/home/circleci/conda" ]; then
-          wget https://repo.anaconda.com/miniconda/Miniconda2-latest-Linux-x86_64.sh
-          /bin/bash Miniconda2-latest-Linux-x86_64.sh -b -p $HOME/conda
-          export PATH=$HOME/conda/bin:$PATH
-          $HOME/conda/bin/python setup.py install
-       else
-           echo "Miniconda 2 is already installed, continuing to build."
-       fi
-
-test_cognitiveatlas: &test_cognitiveatlas
-  name: Test Cognitive Atlas (Used for Python 2 and 3)
-  command: |
-        cd ~/repo/cognitiveatlas/tests
-        $HOME/conda/bin/python -m unittest test_api
-
-jobs:
-  test-python-3:
-    machine: true
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies
-      - run: *install_python_3
-      - run: *waitforapt
-      - run: *install_cognitiveatlas
-      - save_cache:
-          paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
-      - run: *test_cognitiveatlas
-
-  test-python-2:
-    machine: true
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-          - v1-dependencies
-      - run: *install_python_2
-      - run: *waitforapt
-      - run: *install_cognitiveatlas
-      - save_cache:
-          paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
-      - run: *test_cognitiveatlas
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index ef3ccc3..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-machine:
-  environment:
-    TEST_RUN_FOLDER: /tmp
-
-test:
-  override:
-    - bash cognitiveatlas/tests/run_tests.sh $PWD/cognitiveatlas/tests $PWD
-
-dependencies:
-  pre:
-    - echo "Cognitive Atlas!"
-    - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-    - chmod +x miniconda.sh
-    - ./miniconda.sh -b
-    - echo "export PATH=$HOME/miniconda2/bin:\\$PATH" >> $HOME/.bashrc
-    - echo "export PATH=$HOME/miniconda2/bin:\\$PATH" >> $HOME/.env
-    - source $HOME/.bashrc
-    - conda update --yes conda
-    - conda create --yes -n condaenv python=2.7
-    - conda install --yes -n condaenv pip
-    - source activate condaenv
-    - $HOME/miniconda2/bin/pip install setuptools
-    - $HOME/miniconda2/bin/conda install --yes pip pandas nose numpy
-    - $HOME/miniconda2/bin/conda install --yes -c dan_blanchard python-coveralls