diff --git a/Tests/test_Cluster.py b/Tests/test_Cluster.py
index cb14b6d176c..9dbb144a03d 100644
--- a/Tests/test_Cluster.py
+++ b/Tests/test_Cluster.py
@@ -135,6 +135,19 @@ def test_kcluster(self):
                              [ 1, 1, 1, 1, 1],
                              [ 1, 1, 1, 1, 1]], int)
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Method should be one letter:
+        self.assertRaises(ValueError, kcluster, data,
+                          **{"nclusters": nclusters, "mask": mask,
+                             "weight": weight, "transpose": 0, "npass": 100,
+                             "method": "any", "dist": "e"})
+
+        #Distance should be one letter:
+        self.assertRaises(ValueError, kcluster, data,
+                          **{"nclusters": nclusters, "mask": mask,
+                             "weight": weight, "transpose": 0, "npass": 100,
+                             "method": "a", "dist": "euclidean"})
+
         clusterid, error, nfound = kcluster(data, nclusters=nclusters,
                                             mask=mask, weight=weight,
                                             transpose=0, npass=100,
@@ -175,6 +188,19 @@ def test_kcluster(self):
                             [ 1, 1 ],
                             [ 1, 1 ]], int)
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Method should be one letter:
+        self.assertRaises(ValueError, kcluster, data,
+                          **{"nclusters": 3, "mask": mask,
+                             "weight": weight, "transpose": 0, "npass": 100,
+                             "method": "any", "dist": "e"})
+
+        #Distance should be one letter:
+        self.assertRaises(ValueError, kcluster, data,
+                          **{"nclusters": 3, "mask": mask,
+                             "weight": weight, "transpose": 0, "npass": 100,
+                             "method": "a", "dist": "euclidean"})
+
         clusterid, error, nfound = kcluster(data, nclusters=3, mask=mask,
                                             weight=weight, transpose=0,
                                             npass=100, method='a', dist='e')
@@ -207,6 +233,19 @@ def test_clusterdistance(self):
         c2 = [1, 2]
         c3 = [3]
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Method should be one letter:
+        self.assertRaises(ValueError, clusterdistance, data,
+                          **{"mask": mask, "weight": weight,
+                             "index1": c1, "index2": c2, "transpose": 0,
+                             "method": "any", "dist": "e"})
+
+        #Distance should be one letter:
+        self.assertRaises(ValueError, clusterdistance, data,
+                          **{"mask": mask, "weight": weight,
+                             "index1": c1, "index2": c2, "transpose": 0,
+                             "method": "a", "dist": "euclidean"})
+
         distance = clusterdistance(data, mask=mask, weight=weight,
                                    index1=c1, index2=c2, dist='e',
                                    method='a', transpose=0)
@@ -254,6 +293,21 @@ def test_clusterdistance(self):
         c2 = [ 4, 5, 6, 7 ]
         c3 = [ 8 ]
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Method should be one letter:
+        self.assertRaises(ValueError, clusterdistance, data,
+                          **{"mask": mask, "weight": weight,
+                             "index1": c1, "index2": c2,
+                             "method": "any", "dist": "e",
+                             "transpose":0})
+
+        #Distance should be one letter:
+        self.assertRaises(ValueError, clusterdistance, data,
+                          **{"mask": mask, "weight": weight,
+                             "index1": c1, "index2": c2,
+                             "method": "a", "dist": "euclidena",
+                             "transpose":0})
+
         distance = clusterdistance(data, mask=mask, weight=weight,
                                    index1=c1, index2=c2, dist='e',
                                    method='a', transpose=0)
@@ -284,6 +338,17 @@ def test_treecluster(self):
                              [ 1, 1, 1, 1, 1],
                              [ 1, 1, 1, 1, 1]], int)
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Method should be one letter:
+        self.assertRaises(ValueError, treecluster,
+                          **{"data": data1, "mask": mask1, "weight": weight1,
+                             "transpose":0, "method": "any", "dist": "e"})
+
+        #Distance should be one letter:
+        self.assertRaises(ValueError, treecluster,
+                          **{"data": data1, "mask": mask1, "weight": weight1,
+                             "transpose":0, "method": "any", "dist": "euclidean"})
+
         # test first data set
         # Pairwise average-linkage clustering"
         tree = treecluster(data=data1, mask=mask1, weight=weight1,
@@ -552,6 +617,13 @@ def test_somcluster(self):
                             [ 1, 1, 1, 1, 1],
                             [ 1, 1, 1, 1, 1]], int)
 
+        #TODO - Use a context manager here once we drop Python 2.6
+        #Distance should be one letter:
+        self.assertRaises(ValueError, somcluster,
+                          **{"data": data, "mask": mask, "weight": weight,
+                             "transpose": 0, "nxgrid": 10, "nygrid": 10,
+                             "inittau": 0.02, "niter": 100, "dist": "euclidean"})
+
         clusterid, celldata = somcluster(data=data, mask=mask, weight=weight,
                                          transpose=0, nxgrid=10, nygrid=10,
                                          inittau=0.02, niter=100, dist='e')