diff --git a/osc_placement/plugin.py b/osc_placement/plugin.py
index 6d1ed44..2b6be45 100644
--- a/osc_placement/plugin.py
+++ b/osc_placement/plugin.py
@@ -44,8 +44,7 @@ def make_client(instance):
 
 
 def build_option_parser(parser):
-    # ToDo(tetsuro): Make default a negotiate version
-    default = version.SUPPORTED_VERSIONS[0]
+    default = version.NEGOTIATE_VERSIONS[0]
     parser.add_argument(
         '--os-placement-api-version',
         metavar='<placement-api-version>',
diff --git a/osc_placement/tests/functional/base.py b/osc_placement/tests/functional/base.py
index b69d860..b1be13c 100644
--- a/osc_placement/tests/functional/base.py
+++ b/osc_placement/tests/functional/base.py
@@ -52,7 +52,7 @@ class CommandException(Exception):
 
 
 class BaseTestCase(base.BaseTestCase):
-    VERSION = None
+    VERSION = '1.0'
 
     def setUp(self):
         super(BaseTestCase, self).setUp()