diff --git a/tests/test_cathead.py b/tests/test_cathead.py
index 3d81d96..4c9d441 100644
--- a/tests/test_cathead.py
+++ b/tests/test_cathead.py
@@ -1,3 +1,17 @@
+#   (c) Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+#   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.
+
 import unittest
 
 from cathead import cathead
diff --git a/tests/test_certwatcher.py b/tests/test_certwatcher.py
index 71abf2c..9d32e8c 100644
--- a/tests/test_certwatcher.py
+++ b/tests/test_certwatcher.py
@@ -1,3 +1,17 @@
+#   (c) Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+#   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.
+
 import datetime
 import tempfile
 import unittest
diff --git a/tests/test_selfsigndriver.py b/tests/test_selfsigndriver.py
index cc02c1c..c856725 100644
--- a/tests/test_selfsigndriver.py
+++ b/tests/test_selfsigndriver.py
@@ -1,3 +1,17 @@
+#   (c) Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+#   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.
+
 import re
 import tempfile
 import unittest
diff --git a/tests/test_x509.py b/tests/test_x509.py
index b8b8879..56c4f8c 100644
--- a/tests/test_x509.py
+++ b/tests/test_x509.py
@@ -1,3 +1,17 @@
+#   (c) Copyright 2015 Hewlett-Packard Development Company, L.P.
+#
+#   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.
+
 import datetime
 import re
 import unittest
diff --git a/tests/util.py b/tests/util.py
deleted file mode 100644
index e69de29..0000000