diff --git a/pysteel/cloudfoundry.py b/pysteel/cloudfoundry.py
index adc53dd73..f7ac7ad4e 100644
--- a/pysteel/cloudfoundry.py
+++ b/pysteel/cloudfoundry.py
@@ -20,17 +20,16 @@ class CloudFoundry(object):
     def __init__(self, context):
         self._context = context
 
-    def login(self, api_url, username, password, org, space):
+    def login(self, api_url, username, password, org):
         """
         Login to Cloud Foundry
         :type api_url: str
         :type username: str
         :type password: str
         :type org: str
-        :type space: str
         """
         self._context.log.info('logging into Cloud Foundry')
-        cmd_s = 'cf login -a {} -u {} -p {} -o {} -s {}'.format(api_url, username, password, org, space)
+        cmd_s = 'cf login -a {} -u {} -p {} -o {}'.format(api_url, username, password, org)
         command.Command(self._context, cmd_s).run()
 
     def get_api_endpoint(self):
diff --git a/pysteel/scaffold/cloudfoundry.py b/pysteel/scaffold/cloudfoundry.py
index 8f829b1a9..12b16eec4 100644
--- a/pysteel/scaffold/cloudfoundry.py
+++ b/pysteel/scaffold/cloudfoundry.py
@@ -25,9 +25,7 @@ def setup(context, scenario):
             context.options.cf.apiurl,
             context.options.cf.username,
             context.options.cf.password,
-            context.options.cf.org,
-            'development'
-        )
+            context.options.cf.org)
     else:
         context.log.info('CloudFoundry credentials not provided, assuming already logged in')
     context.cf_space = context.options.cf.space