diff --git a/ceilometer_powervm/__init__.py b/ceilometer_powervm/__init__.py
index 31285c4..e69de29 100644
--- a/ceilometer_powervm/__init__.py
+++ b/ceilometer_powervm/__init__.py
@@ -1,14 +0,0 @@
-# Copyright 2011 OpenStack Foundation
-# All Rights Reserved.
-#
-#    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
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
diff --git a/ceilometer_powervm/compute/virt/powervm/__init__.py b/ceilometer_powervm/compute/virt/powervm/__init__.py
index a4215e2..e69de29 100644
--- a/ceilometer_powervm/compute/virt/powervm/__init__.py
+++ b/ceilometer_powervm/compute/virt/powervm/__init__.py
@@ -1,16 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# All Rights Reserved.
-#
-#    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
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
diff --git a/ceilometer_powervm/compute/virt/powervm/inspector.py b/ceilometer_powervm/compute/virt/powervm/inspector.py
index 8b57f36..912b875 100644
--- a/ceilometer_powervm/compute/virt/powervm/inspector.py
+++ b/ceilometer_powervm/compute/virt/powervm/inspector.py
@@ -15,3 +15,6 @@
 #    under the License.
 #
 # @author: Adam Reznechek, IBM Corp.
+
+# Simple pass till we add content
+pass
diff --git a/ceilometer_powervm/tests/compute/virt/powervm/__init__.py b/ceilometer_powervm/tests/compute/virt/powervm/__init__.py
index a4215e2..e69de29 100644
--- a/ceilometer_powervm/tests/compute/virt/powervm/__init__.py
+++ b/ceilometer_powervm/tests/compute/virt/powervm/__init__.py
@@ -1,16 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# All Rights Reserved.
-#
-#    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
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
diff --git a/requirements.txt b/requirements.txt
index 823c2b4..75e9e30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,4 @@
 oslosphinx
 pbr>=0.6,!=0.7,<1.0
 sphinx>=1.1.2,<1.2
-testrepository>=0.0.18
-testtools>=0.9.34
 yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index 23bc696..0ec1e71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,8 @@ setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        -egit+https://github.com/openstack/ceilometer#egg=ceilometer
-commands = python -m ceilometer.openstack.common.lockutils python setup.py testr --slowest --testr-args="{posargs}"
+       -egit+ssh://***REMOVED***:29418/python-powervm.git#egg=python-powervm
+commands = python -m oslo.concurrency.lockutils python setup.py testr --slowest --testr-args="{posargs}"
 downloadcache = {toxworkdir}/_download
 
 [testenv:pep8]