diff --git a/openstackclient/tests/functional/volume/v1/common.py b/openstackclient/tests/functional/volume/v1/common.py
index 4978cea31c..bb3c674ea4 100644
--- a/openstackclient/tests/functional/volume/v1/common.py
+++ b/openstackclient/tests/functional/volume/v1/common.py
@@ -12,14 +12,35 @@
 
 import fixtures
 
-from openstackclient.tests.functional.volume import base
+from openstackclient.tests.functional import base
+from openstackclient.tests.functional.volume import base as volume_base
 
 
-class BaseVolumeTests(base.BaseVolumeTests):
-    """Base class for Volume functional tests. """
+class BaseVolumeTests(volume_base.BaseVolumeTests):
+    """Base class for Volume functional tests"""
+
+    @classmethod
+    def setUpClass(cls):
+        super(BaseVolumeTests, cls).setUpClass()
+        # TODO(dtroyer): This needs to be updated to specifically check for
+        #                Volume v1 rather than just 'volume', but for now
+        #                that is enough until we get proper version negotiation
+        cls.haz_volume_v1 = base.is_service_enabled('volume')
 
     def setUp(self):
         super(BaseVolumeTests, self).setUp()
+
+        # This class requires Volume v1
+        # if not self.haz_volume_v1:
+        #     self.skipTest("No Volume v1 service present")
+
+        # TODO(dtroyer): We really want the above to work but right now
+        #                (12Sep2017) DevStack still creates a 'volume'
+        #                service type even though there is no service behind
+        #                it.  Until that is fixed we need to just skip the
+        #                volume v1 functional tests in master.
+        self.skipTest("No Volume v1 service present")
+
         ver_fixture = fixtures.EnvironmentVariable(
             'OS_VOLUME_API_VERSION', '1'
         )