diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index 274c808..f8c8ac0 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -10,8 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from ceilometerclient.common import utils
 from keystoneclient.v2_0 import client as ksclient
+import six
+
+from ceilometerclient.common import utils
 
 
 def _get_ksclient(**kwargs):
@@ -58,8 +60,11 @@ def get_client(api_version, **kwargs):
             * insecure: allow insecure SSL (no cert verification)
             * os_tenant_{name|id}: name or ID of tenant
     """
-    if kwargs.get('os_auth_token') and kwargs.get('ceilometer_url'):
-        token = kwargs.get('os_auth_token')
+    token = kwargs.get('os_auth_token')
+    if token:
+        token = (token if six.callable(token) else lambda: token)
+
+    if token and kwargs.get('ceilometer_url'):
         endpoint = kwargs.get('ceilometer_url')
     elif (kwargs.get('os_username') and
           kwargs.get('os_password') and
@@ -79,9 +84,7 @@ def get_client(api_version, **kwargs):
             'insecure': kwargs.get('insecure'),
         }
         _ksclient = _get_ksclient(**ks_kwargs)
-        token = ((lambda: kwargs.get('os_auth_token'))
-                 if kwargs.get('os_auth_token')
-                 else (lambda: _ksclient.auth_token))
+        token = token or (lambda: _ksclient.auth_token)
 
         endpoint = kwargs.get('ceilometer_url') or \
             _get_endpoint(_ksclient, **ks_kwargs)
diff --git a/ceilometerclient/tests/test_client.py b/ceilometerclient/tests/test_client.py
new file mode 100644
index 0000000..fe9d5b0
--- /dev/null
+++ b/ceilometerclient/tests/test_client.py
@@ -0,0 +1,55 @@
+#   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.
+
+import types
+
+from ceilometerclient import client
+from ceilometerclient.tests import utils
+from ceilometerclient.v1 import client as v1client
+from ceilometerclient.v2 import client as v2client
+
+FAKE_ENV = {'os_username': 'username',
+            'os_password': 'password',
+            'os_tenant_name': 'tenant_name',
+            'os_auth_url': 'http://no.where',
+            'os_auth_token': '1234',
+            'ceilometer_url': 'http://no.where'}
+
+
+class ClientTest(utils.BaseTestCase):
+
+    def create_client(self, api_version=2, exclude=[]):
+        env = dict((k, v) for k, v in FAKE_ENV.items() if k not in exclude)
+        return client.get_client(api_version, **env)
+
+    def setUp(self):
+        super(ClientTest, self).setUp()
+
+    def test_client_version(self):
+        c1 = self.create_client(api_version=1)
+        self.assertIsInstance(c1, v1client.Client)
+
+        c2 = self.create_client(api_version=2)
+        self.assertIsInstance(c2, v2client.Client)
+
+    def test_client_auth_lambda(self):
+        FAKE_ENV['os_auth_token'] = lambda: FAKE_ENV['os_auth_token']
+        self.assertIsInstance(FAKE_ENV['os_auth_token'],
+                              types.FunctionType)
+        c2 = self.create_client()
+        self.assertIsInstance(c2, v2client.Client)
+
+    def test_client_auth_non_lambda(self):
+        FAKE_ENV['os_auth_token'] = "1234"
+        self.assertIsInstance(FAKE_ENV['os_auth_token'], str)
+        c2 = self.create_client()
+        self.assertIsInstance(c2, v2client.Client)