diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index 9c13f181d..000000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-coverage:
-  precision: 2
-  round: down
-  range: "70...100"
-
-  status:
-    project:
-      default:
-        # TODO(texasaggie97) - target lowered when adding system test coverage. Raise as coverage rises.
-        target: 85%
-        threshhold: 5
-    patch:
-      default:
-        target: 70%
-        threshhold: 5
-
-
diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 000000000..6ec12524a
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1,2 @@
+parallel: true
+
diff --git a/.travis.yml b/.travis.yml
index 51ed66318..0bd0900d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,14 +28,12 @@ matrix:
 install:
   - travis_retry sudo apt-get -y install python3-pip
   - travis_retry pip install --upgrade pip
-  - travis_retry pip install --upgrade tox tox-travis codecov
+  - travis_retry pip install --upgrade tox tox-travis coveralls
+
 
 script:
   - tox -c tox-travis.ini
 
 after_success:
-  - travis_retry codecov --flags codegenunittests --file codegen.xml
-  - travis_retry codecov --flags nifakeunittests --file nifakeunittest.xml
-  - travis_retry codecov --flags nimodinstunittests --file nimodinstunittest.xml
-  - travis_retry codecov --flags nitclkunittests --file nitclkunittest.xml
+  - travis_retry coveralls --rcfile=tools/coverage_unit_tests.rc
 
diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako
index 4d836479a..974f21ef6 100644
--- a/build/templates/tox-system_tests.ini.mako
+++ b/build/templates/tox-system_tests.ini.mako
@@ -47,36 +47,37 @@ changedir =
 commands =
 % if uses_other_wheel:
     ${wheel_env_no_py}: python.exe setup.py bdist_wheel --universal
+
 % endif
-    ${module_name}-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
 % if uses_other_wheel:
     ${module_name}-system_tests: python ../../tools/install_local_wheel.py --driver ${other_wheel} --start-path ../..
 % endif
-    ${module_name}-system_tests: python -c "import platform; print(platform.architecture())"
     ${module_name}-system_tests: python -c "import ${module_name}; ${module_name}.print_diagnostic_information()"
     ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m py.test ../../src/${module_name}/examples --junitxml=../../generated/junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml {posargs}
     ${module_name}-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source ${module_name} --parallel-mode -m py.test ../../src/${module_name}/system_tests --junitxml=../../generated/junit/junit-${module_name}-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     ${module_name}-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     ${module_name}-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     ${module_name}-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    ${module_name}-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags ${module_name}systemtests --name ${module_name} --root ../.. --file ../../generated/${module_name}/coverage.xml
+    ${module_name}-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
 % if uses_other_wheel:
     ${wheel_env_no_py}: packaging
+
 % endif
     ${module_name}-system_tests: pytest
     ${module_name}-system_tests: coverage
     ${module_name}-system_tests: numpy
     ${module_name}-system_tests: scipy
     ${module_name}-system_tests: fasteners
+
     ${module_name}-coverage: coverage
-    ${module_name}-coverage: codecov
+    ${module_name}-coverage: coveralls
 
 depends =
     ${module_name}-coverage: py{35,36,37,38}-${module_name}-system_tests
@@ -91,6 +92,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini
index a97cd8e0e..14a4a2ea5 100644
--- a/generated/nidcpower/tox-system_tests.ini
+++ b/generated/nidcpower/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nidcpower-coverage: .
 
 commands =
-    nidcpower-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidcpower-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nidcpower-system_tests: python -c "import platform; print(platform.architecture())"
     nidcpower-system_tests: python -c "import nidcpower; nidcpower.print_diagnostic_information()"
     nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m py.test ../../src/nidcpower/examples --junitxml=../../generated/junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml {posargs}
     nidcpower-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidcpower --parallel-mode -m py.test ../../src/nidcpower/system_tests --junitxml=../../generated/junit/junit-nidcpower-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidcpower-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nidcpower-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nidcpower-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidcpowersystemtests --name nidcpower --root ../.. --file ../../generated/nidcpower/coverage.xml
+    nidcpower-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidcpower-system_tests: pytest
@@ -40,8 +38,9 @@ deps =
     nidcpower-system_tests: numpy
     nidcpower-system_tests: scipy
     nidcpower-system_tests: fasteners
+
     nidcpower-coverage: coverage
-    nidcpower-coverage: codecov
+    nidcpower-coverage: coveralls
 
 depends =
     nidcpower-coverage: py{35,36,37,38}-nidcpower-system_tests
@@ -53,6 +52,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini
index 422593119..31a182416 100644
--- a/generated/nidigital/tox-system_tests.ini
+++ b/generated/nidigital/tox-system_tests.ini
@@ -22,31 +22,32 @@ changedir =
 
 commands =
     nidigital-wheel_dep: python.exe setup.py bdist_wheel --universal
-    nidigital-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidigital-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nidigital-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nidigital-system_tests: python -c "import platform; print(platform.architecture())"
     nidigital-system_tests: python -c "import nidigital; nidigital.print_diagnostic_information()"
     nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m py.test ../../src/nidigital/examples --junitxml=../../generated/junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml {posargs}
     nidigital-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidigital --parallel-mode -m py.test ../../src/nidigital/system_tests --junitxml=../../generated/junit/junit-nidigital-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidigital-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nidigital-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nidigital-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nidigital-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidigitalsystemtests --name nidigital --root ../.. --file ../../generated/nidigital/coverage.xml
+    nidigital-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidigital-wheel_dep: packaging
+
     nidigital-system_tests: pytest
     nidigital-system_tests: coverage
     nidigital-system_tests: numpy
     nidigital-system_tests: scipy
     nidigital-system_tests: fasteners
+
     nidigital-coverage: coverage
-    nidigital-coverage: codecov
+    nidigital-coverage: coveralls
 
 depends =
     nidigital-coverage: py{35,36,37,38}-nidigital-system_tests
@@ -59,6 +60,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini
index 7231fe9bf..ca19859fa 100644
--- a/generated/nidmm/tox-system_tests.ini
+++ b/generated/nidmm/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nidmm-coverage: .
 
 commands =
-    nidmm-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nidmm-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nidmm-system_tests: python -c "import platform; print(platform.architecture())"
     nidmm-system_tests: python -c "import nidmm; nidmm.print_diagnostic_information()"
     nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m py.test ../../src/nidmm/examples --junitxml=../../generated/junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml {posargs}
     nidmm-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nidmm --parallel-mode -m py.test ../../src/nidmm/system_tests --junitxml=../../generated/junit/junit-nidmm-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nidmm-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nidmm-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nidmm-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nidmmsystemtests --name nidmm --root ../.. --file ../../generated/nidmm/coverage.xml
+    nidmm-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nidmm-system_tests: pytest
@@ -40,8 +38,9 @@ deps =
     nidmm-system_tests: numpy
     nidmm-system_tests: scipy
     nidmm-system_tests: fasteners
+
     nidmm-coverage: coverage
-    nidmm-coverage: codecov
+    nidmm-coverage: coveralls
 
 depends =
     nidmm-coverage: py{35,36,37,38}-nidmm-system_tests
@@ -53,6 +52,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini
index b743b6eab..94e7097f2 100644
--- a/generated/nifake/tox-system_tests.ini
+++ b/generated/nifake/tox-system_tests.ini
@@ -22,31 +22,32 @@ changedir =
 
 commands =
     nifake-wheel_dep: python.exe setup.py bdist_wheel --universal
-    nifake-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nifake-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifake-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nifake-system_tests: python -c "import platform; print(platform.architecture())"
     nifake-system_tests: python -c "import nifake; nifake.print_diagnostic_information()"
     nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m py.test ../../src/nifake/examples --junitxml=../../generated/junit/junit-nifake-{envname}-{env:BITNESS:64}.xml {posargs}
     nifake-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifake --parallel-mode -m py.test ../../src/nifake/system_tests --junitxml=../../generated/junit/junit-nifake-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nifake-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nifake-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nifake-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nifake-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nifakesystemtests --name nifake --root ../.. --file ../../generated/nifake/coverage.xml
+    nifake-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nifake-wheel_dep: packaging
+
     nifake-system_tests: pytest
     nifake-system_tests: coverage
     nifake-system_tests: numpy
     nifake-system_tests: scipy
     nifake-system_tests: fasteners
+
     nifake-coverage: coverage
-    nifake-coverage: codecov
+    nifake-coverage: coveralls
 
 depends =
     nifake-coverage: py{35,36,37,38}-nifake-system_tests
@@ -59,6 +60,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini
index 843548665..af84a1910 100644
--- a/generated/nifgen/tox-system_tests.ini
+++ b/generated/nifgen/tox-system_tests.ini
@@ -22,31 +22,32 @@ changedir =
 
 commands =
     nifgen-wheel_dep: python.exe setup.py bdist_wheel --universal
-    nifgen-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nifgen-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nifgen-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    nifgen-system_tests: python -c "import platform; print(platform.architecture())"
     nifgen-system_tests: python -c "import nifgen; nifgen.print_diagnostic_information()"
     nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m py.test ../../src/nifgen/examples --junitxml=../../generated/junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml {posargs}
     nifgen-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nifgen --parallel-mode -m py.test ../../src/nifgen/system_tests --junitxml=../../generated/junit/junit-nifgen-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nifgen-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nifgen-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nifgen-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nifgen-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nifgensystemtests --name nifgen --root ../.. --file ../../generated/nifgen/coverage.xml
+    nifgen-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nifgen-wheel_dep: packaging
+
     nifgen-system_tests: pytest
     nifgen-system_tests: coverage
     nifgen-system_tests: numpy
     nifgen-system_tests: scipy
     nifgen-system_tests: fasteners
+
     nifgen-coverage: coverage
-    nifgen-coverage: codecov
+    nifgen-coverage: coveralls
 
 depends =
     nifgen-coverage: py{35,36,37,38}-nifgen-system_tests
@@ -59,6 +60,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini
index 9da62142c..66b6ac52a 100644
--- a/generated/nimodinst/tox-system_tests.ini
+++ b/generated/nimodinst/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nimodinst-coverage: .
 
 commands =
-    nimodinst-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nimodinst-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nimodinst-system_tests: python -c "import platform; print(platform.architecture())"
     nimodinst-system_tests: python -c "import nimodinst; nimodinst.print_diagnostic_information()"
     nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m py.test ../../src/nimodinst/examples --junitxml=../../generated/junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml {posargs}
     nimodinst-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nimodinst --parallel-mode -m py.test ../../src/nimodinst/system_tests --junitxml=../../generated/junit/junit-nimodinst-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nimodinst-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nimodinst-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nimodinst-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nimodinstsystemtests --name nimodinst --root ../.. --file ../../generated/nimodinst/coverage.xml
+    nimodinst-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nimodinst-system_tests: pytest
@@ -40,8 +38,9 @@ deps =
     nimodinst-system_tests: numpy
     nimodinst-system_tests: scipy
     nimodinst-system_tests: fasteners
+
     nimodinst-coverage: coverage
-    nimodinst-coverage: codecov
+    nimodinst-coverage: coveralls
 
 depends =
     nimodinst-coverage: py{35,36,37,38}-nimodinst-system_tests
@@ -53,6 +52,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini
index b2f9b75d5..c8effc1fe 100644
--- a/generated/niscope/tox-system_tests.ini
+++ b/generated/niscope/tox-system_tests.ini
@@ -22,31 +22,32 @@ changedir =
 
 commands =
     niscope-wheel_dep: python.exe setup.py bdist_wheel --universal
-    niscope-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     niscope-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     niscope-system_tests: python ../../tools/install_local_wheel.py --driver nitclk --start-path ../..
-    niscope-system_tests: python -c "import platform; print(platform.architecture())"
     niscope-system_tests: python -c "import niscope; niscope.print_diagnostic_information()"
     niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m py.test ../../src/niscope/examples --junitxml=../../generated/junit/junit-niscope-{envname}-{env:BITNESS:64}.xml {posargs}
     niscope-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niscope --parallel-mode -m py.test ../../src/niscope/system_tests --junitxml=../../generated/junit/junit-niscope-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     niscope-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     niscope-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     niscope-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    niscope-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags niscopesystemtests --name niscope --root ../.. --file ../../generated/niscope/coverage.xml
+    niscope-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     niscope-wheel_dep: packaging
+
     niscope-system_tests: pytest
     niscope-system_tests: coverage
     niscope-system_tests: numpy
     niscope-system_tests: scipy
     niscope-system_tests: fasteners
+
     niscope-coverage: coverage
-    niscope-coverage: codecov
+    niscope-coverage: coveralls
 
 depends =
     niscope-coverage: py{35,36,37,38}-niscope-system_tests
@@ -59,6 +60,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini
index 4d3ac5842..a507634f4 100644
--- a/generated/nise/tox-system_tests.ini
+++ b/generated/nise/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     nise-coverage: .
 
 commands =
-    nise-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    nise-system_tests: python -c "import platform; print(platform.architecture())"
     nise-system_tests: python -c "import nise; nise.print_diagnostic_information()"
     nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m py.test ../../src/nise/examples --junitxml=../../generated/junit/junit-nise-{envname}-{env:BITNESS:64}.xml {posargs}
     nise-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nise --parallel-mode -m py.test ../../src/nise/system_tests --junitxml=../../generated/junit/junit-nise-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nise-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nise-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nise-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nisesystemtests --name nise --root ../.. --file ../../generated/nise/coverage.xml
+    nise-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nise-system_tests: pytest
@@ -40,8 +38,9 @@ deps =
     nise-system_tests: numpy
     nise-system_tests: scipy
     nise-system_tests: fasteners
+
     nise-coverage: coverage
-    nise-coverage: codecov
+    nise-coverage: coveralls
 
 depends =
     nise-coverage: py{35,36,37,38}-nise-system_tests
@@ -53,6 +52,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini
index 225b70e41..c29a88a40 100644
--- a/generated/niswitch/tox-system_tests.ini
+++ b/generated/niswitch/tox-system_tests.ini
@@ -19,20 +19,18 @@ changedir =
     niswitch-coverage: .
 
 commands =
-    niswitch-system_tests: python --version
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     niswitch-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
-    niswitch-system_tests: python -c "import platform; print(platform.architecture())"
     niswitch-system_tests: python -c "import niswitch; niswitch.print_diagnostic_information()"
     niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m py.test ../../src/niswitch/examples --junitxml=../../generated/junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml {posargs}
     niswitch-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source niswitch --parallel-mode -m py.test ../../src/niswitch/system_tests --junitxml=../../generated/junit/junit-niswitch-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     niswitch-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     niswitch-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    niswitch-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags niswitchsystemtests --name niswitch --root ../.. --file ../../generated/niswitch/coverage.xml
+    niswitch-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     niswitch-system_tests: pytest
@@ -40,8 +38,9 @@ deps =
     niswitch-system_tests: numpy
     niswitch-system_tests: scipy
     niswitch-system_tests: fasteners
+
     niswitch-coverage: coverage
-    niswitch-coverage: codecov
+    niswitch-coverage: coveralls
 
 depends =
     niswitch-coverage: py{35,36,37,38}-niswitch-system_tests
@@ -53,6 +52,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1
diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini
index 353d94fde..c8aae2ca3 100644
--- a/generated/nitclk/tox-system_tests.ini
+++ b/generated/nitclk/tox-system_tests.ini
@@ -22,31 +22,32 @@ changedir =
 
 commands =
     nitclk-wheel_dep: python.exe setup.py bdist_wheel --universal
-    nitclk-system_tests: python --version
+
     # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now
     nitclk-system_tests: python -m pip install --disable-pip-version-check --upgrade pip
     nitclk-system_tests: python ../../tools/install_local_wheel.py --driver niscope --start-path ../..
-    nitclk-system_tests: python -c "import platform; print(platform.architecture())"
     nitclk-system_tests: python -c "import nitclk; nitclk.print_diagnostic_information()"
     nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m py.test ../../src/nitclk/examples --junitxml=../../generated/junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml {posargs}
     nitclk-system_tests: coverage run --rcfile=../../tools/coverage_system_tests.rc --source nitclk --parallel-mode -m py.test ../../src/nitclk/system_tests --junitxml=../../generated/junit/junit-nitclk-{envname}-{env:BITNESS:64}.xml {posargs} --durations=5
+
     nitclk-coverage: coverage combine --rcfile=../../tools/coverage_system_tests.rc ./
     # Create the report to upload
     nitclk-coverage: coverage xml -i --rcfile=../../tools/coverage_system_tests.rc
     # Display the coverage results
     nitclk-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc
-    # token is from codecov
-    nitclk-coverage: codecov -X gcov --token=4c58f03d-b74c-489a-889a-ab0a77b7809f --no-color --flags nitclksystemtests --name nitclk --root ../.. --file ../../generated/nitclk/coverage.xml
+    nitclk-coverage: coveralls --rcfile=../../tools/coverage_system_tests.rc
 
 deps =
     nitclk-wheel_dep: packaging
+
     nitclk-system_tests: pytest
     nitclk-system_tests: coverage
     nitclk-system_tests: numpy
     nitclk-system_tests: scipy
     nitclk-system_tests: fasteners
+
     nitclk-coverage: coverage
-    nitclk-coverage: codecov
+    nitclk-coverage: coveralls
 
 depends =
     nitclk-coverage: py{35,36,37,38}-nitclk-system_tests
@@ -58,6 +59,11 @@ passenv =
     BRANCH_NAME
     JENKINS_URL
     BUILD_NUMBER
+    JENKINS_HOME
+    CI_PULL_REQUEST
+
+setenv =
+    COVERALLS_REPO_TOKEN = AzNHcZZM2ZFPWQ8FuhwPQRCIFs7URdzte
 
 [pytest]
 junit_family = xunit1