diff --git a/packstack/installer/setup_controller.py b/packstack/installer/setup_controller.py
index 34b78a05e..6fcbbb0fa 100644
--- a/packstack/installer/setup_controller.py
+++ b/packstack/installer/setup_controller.py
@@ -44,7 +44,7 @@ class Controller(object):
         instance from a class which inherit Controller.
         did not use isinstance because inheritence makes it behave erratically.
         """
-        if self != type(self.__single):
+        if self != type(self.__single):  # flake8: noqa
             self.__single = object.__new__(self, *args, **kwargs)
         return self.__single
 
diff --git a/packstack/modules/documentation.py b/packstack/modules/documentation.py
index b38d0e934..3c651191e 100644
--- a/packstack/modules/documentation.py
+++ b/packstack/modules/documentation.py
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2015 Red Hat, Inc.
 #
-# Author: Martin Magr <mmagr@redhat.com>
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp
index d06923ab9..fdf39b5da 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp
@@ -47,12 +47,6 @@ class packstack::nova::api ()
       api_port  => '8778',
       ssl       => false,
       workers   => hiera('CONFIG_SERVICE_WORKERS'),
-    } ->
-    # TODO(jpena): remove the sample file from the package, then remove this workaround
-    # https://review.rdoproject.org/r/4721
-    file { '/etc/httpd/conf.d/00-nova-placement-api.conf':
-      ensure => absent,
-      before => Service['httpd'],
     }
 
     class { '::nova::placement':
diff --git a/test-requirements.txt b/test-requirements.txt
index 44338878d..013f1390c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,4 +3,4 @@ oslosphinx>=2.5.0 # Apache-2.0
 reno>=0.1.1 # Apache2
 os-testr>=0.4.1 # Apache-2.0
 coverage
-hacking>=0.9.5,<0.10
+hacking!=0.13.0,<0.14,>=0.12.0