diff --git a/.gitignore b/.gitignore
index b774adf0..da6679ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,18 @@
-AUTHORS
-ChangeLog
+*.pyc
+
+# Packages
+*.egg*
 build
+
+# Unit test
+.stestr
 .tox
 .venv
-*.egg*
+
+# pbr generates these
+AUTHORS
+ChangeLog
+
+# Editors
 *.swp
 *.swo
-*.pyc
-.testrepository
\ No newline at end of file
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 1641f86e..00000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list