diff --git a/GPy/testing/__init__.py b/GPy/testing/__init__.py
index f5a4c54f..2e64d90e 100644
--- a/GPy/testing/__init__.py
+++ b/GPy/testing/__init__.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2014, Max Zwiessele
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 """
 
 MaxZ
diff --git a/GPy/testing/index_operations_tests.py b/GPy/testing/index_operations_tests.py
index 738f92b4..e5c2011a 100644
--- a/GPy/testing/index_operations_tests.py
+++ b/GPy/testing/index_operations_tests.py
@@ -1,8 +1,6 @@
-'''
-Created on 12 Feb 2014
+# Copyright (c) 2014, Max Zwiessele
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 
-@author: maxz
-'''
 import unittest
 import numpy as np
 from GPy.core.parameterization.index_operations import ParameterIndexOperations,\
@@ -134,4 +132,4 @@ class Test(unittest.TestCase):
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.test_index_view']
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/GPy/testing/inference_tests.py b/GPy/testing/inference_tests.py
index fd81022a..ac92c519 100644
--- a/GPy/testing/inference_tests.py
+++ b/GPy/testing/inference_tests.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2014, Max Zwiessele
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 """
 The test cases for various inference algorithms
@@ -79,4 +81,4 @@ class InferenceXTestCase(unittest.TestCase):
         
 
 if __name__ == "__main__":
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/GPy/testing/likelihood_tests.py b/GPy/testing/likelihood_tests.py
index 9a188de5..95929098 100644
--- a/GPy/testing/likelihood_tests.py
+++ b/GPy/testing/likelihood_tests.py
@@ -1,3 +1,5 @@
+# Copyright (c) 2014, Alan Saul
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import numpy as np
 import unittest
 import GPy
diff --git a/GPy/testing/mpi_tests.py b/GPy/testing/mpi_tests.py
index 45777eb1..5c489032 100644
--- a/GPy/testing/mpi_tests.py
+++ b/GPy/testing/mpi_tests.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, GPy authors (see AUTHORS.txt).
+# Copyright (c) 2013-2014, Zhenwen Dai
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import unittest
@@ -89,4 +89,4 @@ if __name__ == "__main__":
         import mpi4py
         unittest.main()
     except:
-        pass
\ No newline at end of file
+        pass
diff --git a/GPy/testing/observable_tests.py b/GPy/testing/observable_tests.py
index d8aad4c7..84059d98 100644
--- a/GPy/testing/observable_tests.py
+++ b/GPy/testing/observable_tests.py
@@ -1,8 +1,5 @@
-'''
-Created on 27 Feb 2014
-
-@author: maxz
-'''
+# Copyright (c) 2014, Max Zwiessele
+# Licensed under the BSD 3-clause license (see LICENSE.txt)
 import unittest
 from GPy.core.parameterization.parameterized import Parameterized
 from GPy.core.parameterization.param import Param
@@ -132,4 +129,4 @@ class Test(unittest.TestCase):
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']
-    unittest.main()
\ No newline at end of file
+    unittest.main()