diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c834a581..d4bcd86a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -130,7 +130,7 @@ jobs:
             source activate tedana_py37  # depends on makeenv37
             make lint
 
-  build_docs:
+  three-echo:
     docker:
       - image: continuumio/miniconda3
     working_directory: /tmp/src/tedana
@@ -139,17 +139,21 @@ jobs:
       - restore_cache:
           key: conda-py37-v1-{{ checksum "dev_requirements.txt" }}
       - run:
-          name: Build docs
+          name: Run integration tests
+          no_output_timeout: 40m
           command: |
             apt-get install -yqq make
-            source activate tedana_py37   # depends on makeenv37
-            cd docs && make html doctest
-            mkdir /tmp/docs
-            mv /tmp/src/tedana/docs/_build/* /tmp/docs/
+            source activate tedana_py37  # depends on makeenv_37
+            make three-echo
+            mkdir /tmp/src/coverage
+            mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.three-echo
       - store_artifacts:
-          path: /tmp/docs
-
-  integration:
+          path: /tmp/data
+      - persist_to_workspace:
+          root: /tmp
+          paths:
+              - src/coverage/.coverage.three-echo
+  five-echo:
     docker:
       - image: continuumio/miniconda3
     working_directory: /tmp/src/tedana
@@ -163,15 +167,15 @@ jobs:
           command: |
             apt-get install -yqq make
             source activate tedana_py37  # depends on makeenv_37
-            make integration
+            make five-echo
             mkdir /tmp/src/coverage
-            mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.integration
+            mv /tmp/src/tedana/.coverage /tmp/src/coverage/.coverage.five-echo
       - store_artifacts:
           path: /tmp/data
       - persist_to_workspace:
           root: /tmp
           paths:
-              - src/coverage/.coverage.integration
+              - src/coverage/.coverage.five-echo
 
   merge_coverage:
     working_directory: /tmp/src/tedana
@@ -209,10 +213,10 @@ workflows:
       - style_check:
           requires:
             - makeenv_37
-      - integration:
+      - three-echo:
           requires:
             - makeenv_37
-      - build_docs:
+      - five-echo:
           requires:
             - makeenv_37
       - merge_coverage:
@@ -220,4 +224,5 @@ workflows:
             - unittest_35
             - unittest_36
             - unittest_37
-            - integration
+            - three-echo
+            - five-echo
diff --git a/Makefile b/Makefile
index 4ad309fd7..ad706eac5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 .PHONY: all lint
 
-all_tests: lint unittest integration
+all_tests: lint unittest three-echo five-echo
 
 help:
 	@echo "Please use 'make <target>' where <target> is one of:"
 	@echo "  lint			to run flake8 on all Python files"
 	@echo "  unittest		to run unit tests on tedana"
-	@echo "  integration	to run integration tests on tedana"
+	@echo "  three-echo	to run the three-echo test set on tedana"
+	@echo "  five-echo	to run the five-echo test set on tedana"
 	@echo "  all_tests		to run 'lint', 'unittest', and 'integration'"
 
 lint:
@@ -15,5 +16,9 @@ lint:
 unittest:
 	@py.test --skipintegration --cov-append --cov-report term-missing --cov=tedana tedana/
 
-integration:
-	@py.test --cov-append --cov-report term-missing --cov=tedana tedana/tests/test_integration.py
+three-echo:
+	@py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_three_echo tedana/tests/test_integration.py
+
+five-echo:
+	@py.test --cov-append --cov-report term-missing --cov=tedana -k test_integration_five_echo tedana/tests/test_integration.py
+
diff --git a/dev_tools/run_tests.sh b/dev_tools/run_tests.sh
index a6fd7625b..6d1181097 100644
--- a/dev_tools/run_tests.sh
+++ b/dev_tools/run_tests.sh
@@ -17,14 +17,22 @@ cprint() {
 }
 
 
-run_integration_tests() {
+run_three_echo_test() {
     #
-    # Runs tedana integration tests
+    # Runs tedana three-echo test
     #
 
-    cprint "RUNNING INTEGRATION TESTS"
-    make integration
-    cprint "INTEGRATION TESTS PASSED !"
+    cprint "RUNNING THREE-ECHO TEST"
+    make three-echo
+    cprint "THREE-ECHO TEST PASSED !"
+}
+
+run_five_echo_test() {
+    #
+    # Runs tedana five-echo test
+    cprint "RUNNING FIVE-ECHO TEST"
+    make five-echo
+    cprint "FIVE-ECHO TEST PASSED !"
 }
 
 
@@ -57,7 +65,8 @@ run_all_tests() {
 
     run_lint_tests
     run_unit_tests
-    run_integration_tests
+    run_three_echo_test
+    run_five_echo_test
 
     cprint "FINISHED RUNNING ALL TESTS -- GREAT SUCCESS !"
 }