diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 96fc11b4..00000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-version: 2
-
-workflows:
-  version: 2
-  test:
-    jobs:
-      - test-3.6
-      - test-3.7
-      - test-3.8
-
-executor: ubuntu-latest
-
-on:
-  push:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  test-3.6: &test-template
-    docker:
-      - image: circleci/python:3.6
-    resource_class: large
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - run: |
-          sudo apt update
-          sudo apt install espeak-ng git
-      - run: sudo pip install --upgrade pip
-      - run: sudo pip install -e .
-      - run: |
-          sudo pip install --quiet --upgrade cardboardlint pylint
-          cardboardlinter --refspec ${CIRCLE_BRANCH} -n auto
-      - run: nosetests tests --nocapture --processes=0 --process-timeout=20 --process-restartworker
-      - run: |
-          sudo ./tests/test_glow-tts_train.sh
-          sudo ./tests/test_tacotron_train.sh
-          sudo ./tests/test_vocoder_gan_train.sh
-          sudo ./tests/test_vocoder_wavegrad_train.sh
-          sudo ./tests/test_vocoder_wavernn_train.sh
-          sudo ./tests/test_speedy_speech_train.sh
-
-  test-3.7:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.7
-
-  test-3.8:
-    <<: *test-template
-    docker:
-      - image: circleci/python:3.8
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ebb59216..5e874424 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,8 +35,9 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt install -y espeak-ng git
+          sudo apt install -y git make
           sudo apt install -y python3-wheel gcc
+          make system-deps
       - name: Upgrade pip
         # so we can take advantage of pyproject.toml build-dependency support
         run: python3 -m pip install --upgrade pip
@@ -46,17 +47,6 @@ jobs:
           python3 setup.py egg_info
       - name: Lint check
         run: |
-          cardboardlinter
+          make lint
       - name: Unit tests
-        run: nosetests tests --nocapture --processes=0 --process-timeout=20 --process-restartworker
-      - name: Test scripts
-        run: |
-          ./tests/test_demo_server.sh
-          ./tests/test_glow-tts_train.sh
-          ./tests/test_tacotron_train.sh
-          ./tests/test_vocoder_gan_train.sh
-          ./tests/test_vocoder_wavegrad_train.sh
-          ./tests/test_vocoder_wavernn_train.sh
-          ./tests/test_speedy_speech_train.sh
-          ./tests/test_resample.sh
-          ./tests/test_compute_statistics.sh
+        run: make test
diff --git a/Makefile b/Makefile
index 2086774b..c00cd1ce 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ help:
 target_dirs := tests TTS notebooks
 
 system-deps:	## install linux system deps
-	sudo apt-get install espeak-ng
-	sudo apt-get install sndfilelib1-dev
+	sudo apt-get install -y espeak-ng
+	sudo apt-get install -y libsndfile1-dev
 
 deps:	## install 🐸 requirements.
 	pip install -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 7cb7a358..2924f3ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,6 @@ tqdm
 inflect
 bokeh==1.4.0
 pysbd
-# pyworld
 soundfile
 gdown
 umap-learn==0.4.6
diff --git a/requirements_tests.txt b/requirements_tests.txt
deleted file mode 100644
index 5b833858..00000000
--- a/requirements_tests.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-torch>=1.5
-tensorflow==2.3.1
-numpy>=1.16.0
-scipy>=0.19.0
-numba==0.48
-librosa==0.7.2
-phonemizer>=2.2.0
-unidecode==0.4.20
-attrdict
-tensorboardX
-matplotlib
-Pillow
-flask
-tqdm
-inflect
-pysbd
-bokeh==1.4.0
-soundfile
-nose==1.3.7
-cardboardlint==1.3.0
-cython
\ No newline at end of file