diff --git a/tests/test_cmd.py b/tests/cmd/test_update.py
similarity index 83%
rename from tests/test_cmd.py
rename to tests/cmd/test_update.py
index 73b9e32..47af29b 100644
--- a/tests/test_cmd.py
+++ b/tests/cmd/test_update.py
@@ -19,7 +19,7 @@ from testtools import matchers
 from tests.cmd.base import TestCase
 
 
-class TestCaseCmd(TestCase):
+class TestCaseUpdate(TestCase):
 
     def test_update_without_path(self):
         required = [
@@ -32,9 +32,3 @@ class TestCaseCmd(TestCase):
             self.assertThat(
                 (stdout + stderr),
                 matchers.MatchesRegex(r, re.DOTALL | re.MULTILINE))
-
-    def test_version(self):
-        stdout, stderr = self.shell('--version')
-        self.assertThat(
-            (stdout + stderr),
-            matchers.MatchesRegex('.*?^(\d+)\.(\d+)\.(\d+)'))
diff --git a/tests/cmd/test_version.py b/tests/cmd/test_version.py
new file mode 100644
index 0000000..918dad5
--- /dev/null
+++ b/tests/cmd/test_version.py
@@ -0,0 +1,26 @@
+# Copyright 2015 Red Hat, Inc.
+#
+# 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.
+
+from testtools import matchers
+
+from tests.cmd.base import TestCase
+
+
+class TestCaseVersion(TestCase):
+
+    def test_version(self):
+        stdout, stderr = self.shell('--version')
+        self.assertThat(
+            (stdout + stderr),
+            matchers.MatchesRegex('.*?^(\d+)\.(\d+)\.(\d+)'))