diff --git a/barbicanclient/common/__init__.py b/barbicanclient/common/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/barbicanclient/common/config.py b/barbicanclient/common/config.py
deleted file mode 100644
index 12f9c13e..00000000
--- a/barbicanclient/common/config.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2013 Rackspace, 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.
-
-"""
-Configuration setup for Barbican Client.
-"""
-
-from barbicanclient.version import __version__
-from oslo_config import cfg
-
-CONF = cfg.CONF
-
-
-def parse_args(args=None, usage=None, default_config_files=None):
-    CONF(args=args,
-         project='barbicanclient',
-         prog='barbicanclient',
-         version=__version__,
-         usage=usage,
-         default_config_files=default_config_files)
diff --git a/requirements.txt b/requirements.txt
index d3c61547..64b7c89b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@ pbr>=1.8 # Apache-2.0
 requests!=2.12.2,>=2.10.0 # Apache-2.0
 six>=1.9.0 # MIT
 cliff>=2.3.0 # Apache-2.0
-oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
 keystoneauth1>=2.18.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index ffcf70a3..13a4d0b4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,6 +10,7 @@ testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 nose # LGPL
+oslo.config>=3.14.0,!=3.18.0 # Apache-2.0
 python-openstackclient>=3.3.0 # Apache-2.0
 
 # Documentation build requirements