diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index 22573f75..e5de7c11 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -13,18 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import json
+import logging
 import os
 
 import requests
 
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common.gettextutils import _
 from barbicanclient import orders
 from barbicanclient import secrets
 
 
 LOG = logging.getLogger(__name__)
-logging.setup('barbicanclient')
 
 
 class HTTPError(Exception):
diff --git a/barbicanclient/common/auth.py b/barbicanclient/common/auth.py
index 144076db..2c91c58d 100644
--- a/barbicanclient/common/auth.py
+++ b/barbicanclient/common/auth.py
@@ -12,9 +12,13 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from keystoneclient.v2_0 import client as ksclient
 from keystoneclient import exceptions
 
+LOG = logging.getLogger(__name__)
+
 
 class AuthException(Exception):
     """Raised when authorization fails."""
diff --git a/barbicanclient/keep.py b/barbicanclient/keep.py
index ef935086..eead1919 100644
--- a/barbicanclient/keep.py
+++ b/barbicanclient/keep.py
@@ -19,6 +19,9 @@ import argparse
 
 from barbicanclient.common import auth
 from barbicanclient import client
+from barbicanclient.openstack.common import log as logging
+
+logging.setup('barbicanclient')
 
 
 class Keep:
diff --git a/barbicanclient/orders.py b/barbicanclient/orders.py
index 27d52a59..3747306f 100644
--- a/barbicanclient/orders.py
+++ b/barbicanclient/orders.py
@@ -12,9 +12,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from barbicanclient import base
 from barbicanclient.openstack.common.gettextutils import _
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common import timeutils
 
 
diff --git a/barbicanclient/secrets.py b/barbicanclient/secrets.py
index f4dda80e..a479f2c4 100644
--- a/barbicanclient/secrets.py
+++ b/barbicanclient/secrets.py
@@ -12,8 +12,9 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import logging
+
 from barbicanclient import base
-from barbicanclient.openstack.common import log as logging
 from barbicanclient.openstack.common.timeutils import parse_isotime