diff --git a/.gitignore b/.gitignore
index 963e589a..cd91eafc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,8 +26,7 @@ cover/
 .coverage*
 !.coveragerc
 .tox
-nosetests.xml
-.testrepository
+.stestr/
 .venv
 
 # Translations
@@ -55,4 +54,4 @@ ChangeLog
 .*sw?
 
 # Files created by releasenotes build
-releasenotes/build
\ No newline at end of file
+releasenotes/build
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 24fee3c9..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./vmware_nsxlib/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 83f145ef..463c557c 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -128,7 +128,6 @@ stevedore==1.20.0
 tempest==17.1.0
 Tempita==0.5.2
 tenacity==4.4.0
-testrepository==0.0.18
 testresources==2.0.0
 testscenarios==0.4
 testtools==2.2.0
diff --git a/run_tests.sh b/run_tests.sh
index fbc600c5..289790fa 100644
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -196,7 +196,7 @@ function run_pep8_changed {
 }
 
 
-TESTRTESTS="python setup.py testr"
+TESTRTESTS="stestr run"
 
 if [ $never_venv -eq 0 ]
 then
diff --git a/test-requirements.txt b/test-requirements.txt
index 88b1d654..d63ef451 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,7 +13,6 @@ sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 testscenarios>=0.4 # Apache-2.0/BSD