diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..4897772
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ ${TESTS_DIR:-./proliantutils/tests/} $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
diff --git a/ChangeLog b/ChangeLog
index 5933f7c..2c3651f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,14 @@
 CHANGES
 =======
 
-v0.1.2
-------
-
-* added update_persistent_mode and other helper functions
-
-v1.1
-----
-
-* new commands added
+* Fix update_persistent_boot for Gen9 servers
+* Backout changes from 18bbcad
+* Add system health methods to ribcl module
+* Remove unused variable
+* Fix minor space issues in ribcl module
+* Add update_persistent_boot to ribcl module
+* Add boot mode commands to ribcl module
 * Add support for pbr
-* Adding Documentation to ribcl module
+* Add documentation to ribcl module
 * Submit ribcl ilo module
 * Initial commit
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..dde8185
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+six>=1.9.0
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..3cc04cd
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,2 @@
+mock
+testrepository>=0.0.18
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..5934343
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,27 @@
+[tox]
+envlist = py27,pep8
+
+[testenv]
+usedevelop = True
+install_command = pip install -i http://pypi.gocept.com/simple/ -U {opts} {packages}
+deps =
+  -r{toxinidir}/requirements.txt
+  -r{toxinidir}/test-requirements.txt
+commands =
+  bash -c "TESTS_DIR=./proliantutils/tests/ python setup.py testr --slowest --testr-args='{posargs}'"
+#setenv = PYTHONDONTWRITEBYTECODE=1
+
+[testenv:pep8]
+basepython = python2.7
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+commands =
+    flake8 proliantutils
+
+[flake8]
+max-complexity=15
+
+[testenv:venv]
+setenv = PYTHONHASHSEED=0
+commands = {posargs}