diff --git a/.testr.conf.new b/.testr.conf.new
new file mode 100644
index 000000000..0f728c39e
--- /dev/null
+++ b/.testr.conf.new
@@ -0,0 +1,7 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ ./congress/tests2 $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/.testr.conf b/.testr.conf.old
similarity index 100%
rename from .testr.conf
rename to .testr.conf.old
diff --git a/congress/tests2/__init__.py b/congress/tests2/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/congress/tests2/api/__init__.py b/congress/tests2/api/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/check_dot_testr_conf.sh b/tools/check_dot_testr_conf.sh
new file mode 100755
index 000000000..3e4ed0f8e
--- /dev/null
+++ b/tools/check_dot_testr_conf.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+target=$1
+
+if [ -e '.testr.conf' ] ; then
+    rm .testr.conf
+fi
+ln -s $target .testr.conf
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index f55dd936b..f2659a8b0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py34,py27,pep8
+envlist = py34,py27,pep8,new_arch
 
 [testenv]
 usedevelop = True
@@ -16,6 +16,24 @@ setenv =
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = 
+ {toxinidir}/tools/check_dot_testr_conf.sh .testr.conf.old
+ find . -type f -name "*.pyc" -delete
+ python setup.py testr --slowest --testr-args='{posargs}'
+
+[testenv:new_arch]
+usedevelop = True
+
+install_command = pip install -U {opts} {packages}
+whitelist_externals = find
+setenv =
+   VIRTUAL_ENV={envdir}
+   LANG=en_US.UTF-8
+   LANGUAGE=en_US
+   LC_ALL=en_US.utf-8
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = 
+ {toxinidir}/tools/check_dot_testr_conf.sh .testr.conf.new
  find . -type f -name "*.pyc" -delete
  python setup.py testr --slowest --testr-args='{posargs}'