diff --git a/resources/cinder_api_puppet/test.py b/resources/cinder_api_puppet/test.py
index a6f4d9b7..e1c67cec 100644
--- a/resources/cinder_api_puppet/test.py
+++ b/resources/cinder_api_puppet/test.py
@@ -6,5 +6,5 @@ from solar.core.log import log
 def test(resource):
     log.debug('Testing cinder_api_puppet')
     requests.get(
-        'http://%s:%s' % (resource.args['ip'].value, resource.args['port'].value)
+        'http://%s:%s' % (resource.args['ip'].value, resource.args['service_port'].value)
     )
diff --git a/resources/glance_puppet/meta.yaml b/resources/glance_puppet/meta.yaml
index 052c5232..589002fe 100644
--- a/resources/glance_puppet/meta.yaml
+++ b/resources/glance_puppet/meta.yaml
@@ -50,7 +50,7 @@ input:
       value: '127.0.0.1'
     auth_url:
       schema: str
-      value: 'http://localhost:5000/v2.0'
+      value: 'http://{{auth_host}}:{{auth_port}}/v2.0'
     auth_port:
       schema: int
       value: 35357
diff --git a/resources/glance_registry_puppet/test.py b/resources/glance_registry_puppet/test.py
index e2374cbd..9c1d84b8 100644
--- a/resources/glance_registry_puppet/test.py
+++ b/resources/glance_registry_puppet/test.py
@@ -6,5 +6,5 @@ from solar.core.log import log
 def test(resource):
     log.debug('Testing glance_registry_puppet')
     requests.get(
-        'http://%s:%s' % (resource.args['ip'].value, resource.args['port'].value)
+        'http://%s:%s' % (resource.args['ip'].value, resource.args['bind_port'].value)
     )