diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix
new file mode 100644
index 000000000000..3dbf54102e90
--- /dev/null
+++ b/pkgs/development/python-modules/os-testr/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchurl, python,
+  pbr, Babel, testrepository, subunit, testtools,
+  coverage, oslosphinx, oslotest, testscenarios, six, ddt 
+}:
+buildPythonPackage rec {
+  name = "os-testr-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/o/os-testr/${name}.tar.gz";
+    sha256 = "10ws7l5p25psnp6rwymwdzh4zagmmnbf56xwg06cn2292m95l4i7";
+  };
+
+  patchPhase = ''
+    sed -i 's@python@${python.interpreter}@' .testr.conf
+    sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf
+  '';
+
+  checkPhase = ''
+    export PATH=$PATH:$out/bin
+    ${python.interpreter} setup.py test
+  '';
+
+  propagatedBuildInputs = [ pbr Babel testrepository subunit testtools ];
+  buildInputs = [ coverage oslosphinx oslotest testscenarios six ddt ];
+
+  meta = with stdenv.lib; {
+    description = "A testr wrapper to provide functionality for OpenStack projects";
+    homepage  = http://docs.openstack.org/developer/os-testr/;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 774ef2fb0fcf..9151bbd08090 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16647,33 +16647,7 @@ in {
 
   };
 
-  os-testr = buildPythonPackage rec {
-    name = "os-testr-${version}";
-    version = "0.4.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/os-testr/${name}.tar.gz";
-      sha256 = "0474z0mxb7y3vfk4s097wf1mzji5d135vh27cvlh9q17rq3x9r3w";
-    };
-
-    patchPhase = ''
-      sed -i 's@python@${python.interpreter}@' .testr.conf
-      sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf
-    '';
-
-    checkPhase = ''
-      export PATH=$PATH:$out/bin
-      ${python.interpreter} setup.py test
-    '';
-
-    propagatedBuildInputs = with self; [ pbr Babel testrepository subunit testtools ];
-    buildInputs = with self; [ coverage oslosphinx oslotest testscenarios six ddt ];
-
-    # Requires pbr < 2
-    # Or update to latest version but that requires updating the whole of openstack / oslo
-    meta.broken = true;
-
-  };
+  os-testr = callPackage ../development/python-modules/os-testr { };
 
   bandit = buildPythonPackage rec {
     name = "bandit-${version}";
@@ -17007,6 +16981,8 @@ in {
 
     meta = with stdenv.lib; {
       homepage = "https://launchpad.net/python-cliff";
+      # requires an update, incompatible with current dependencies (pbr)
+      broken = true;
     };
   };
 
@@ -17100,6 +17076,9 @@ in {
    meta = with stdenv.lib; {
      description = "Python bindings to the OpenStack Images API";
      homepage = "http://www.openstack.org/";
+
+     # requires an update, incompatible with current dependencies (pbr)
+     broken = true;
    };
  };