diff --git a/tests/measurement_test.py b/tests/measurement_test.py
index 69bc3ba..89d0adf 100644
--- a/tests/measurement_test.py
+++ b/tests/measurement_test.py
@@ -9,6 +9,7 @@ import pytz
 from datetime import datetime
 from monascaclient import client
 import monascaclient.exc as exc
+import utils
 
 
 def call_mon_api(method, fields):
@@ -32,10 +33,7 @@ def main():
         print('usage: %s metric_name count' % sys.argv[0], file=sys.stderr)
         return 1
 
-    api_version = '2_0'
-    endpoint = 'http://192.168.10.4:8080/v2.0'
-    kwargs = {'token': '82510970543135'}
-    mon_client = client.Client(api_version, endpoint, **kwargs)
+    mon_client = utils.create_mon_client()
 
     metric_start_time = time.time()
     metric_name = sys.argv[1]
@@ -83,7 +81,7 @@ def main():
     print('Took %d seconds for metrics to fully arrive' % i)
     expected = num_metrics_to_send - 1
     result = 0
-    for index in range(0, num_metrics_to_send):
+    for index in range(num_metrics_to_send, 0):
         value = measurements[index]
         if value[2] != expected:
             print('Expected %d but found %d for %d' %
diff --git a/tests/utils.py b/tests/utils.py
index b3d36b5..29f48e6 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -6,12 +6,19 @@ import json
 import subprocess
 import cli_wrapper
 from monascaclient import client
+from monagent.common.keystone import Keystone
 
 """
     Utility methods for testing
 """
 
 
+OS_USERNAME = 'mini-mon'
+OS_PASSWORD = 'password'
+OS_TENANT_NAME = 'mini-mon'
+OS_AUTH_URL = 'http://192.168.10.5:35357/'
+
+
 def check_alarm_history(alarm_id, states):
     transitions = len(states) - 1
     print('Checking Alarm History')
@@ -78,10 +85,11 @@ def setup_cli():
     api_host = get_api_host()
 
     # These need to be set because we are invoking the CLI as a process
-    os.environ['OS_USERNAME'] = 'mini-mon'
-    os.environ['OS_PASSWORD'] = 'password'
-    os.environ['OS_TENANT_NAME'] = 'mini-mon'
-    os.environ['OS_AUTH_URL'] = 'http://192.168.10.5:35357/v2.0/'
+    os.environ['OS_USERNAME'] = OS_USERNAME
+    os.environ['OS_PASSWORD'] = OS_PASSWORD
+    os.environ['OS_TENANT_NAME'] = OS_TENANT_NAME
+    # I don't know v2.0 is needed for CLI, but v3 if client accessed directly
+    os.environ['OS_AUTH_URL'] = OS_AUTH_URL + 'v2.0/'
     os.environ['MONASCA_API_URL'] = 'http://' + api_host + ':8080/v2.0/'
     os.environ['http_proxy'] = ''
     os.environ['https_proxy'] = ''
@@ -92,12 +100,25 @@ def setup_cli():
 def create_mon_client():
     api_host = get_api_host()
 
+    # See above comment for v3 vs v2.0
+    token = get_token(OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME,
+                      OS_AUTH_URL + 'v3/')
+
     api_version = '2_0'
     endpoint = 'http://' + api_host + ':8080/v2.0'
-    kwargs = {'token': '82510970543135'}
+    kwargs = {'token': token}
     return client.Client(api_version, endpoint, **kwargs)
 
 
+def get_token(os_username, os_password, os_tenant_name, os_auth_url):
+    keystone = Keystone(os_auth_url,
+                        os_username,
+                        os_password,
+                        os_tenant_name)
+
+    return keystone.refresh_token()
+
+
 def ensure_has_notification_engine():
     if not os.path.isfile('/etc/monasca/notification.yaml'):
         print('Must be run on a VM with Notification Engine installed',