diff --git a/system_tests/role_tests.py b/system_tests/role_tests.py
index aade14ed..3179daf3 100644
--- a/system_tests/role_tests.py
+++ b/system_tests/role_tests.py
@@ -1,6 +1,7 @@
 from click.testing import CliRunner
 
 from pyvcloud.system_test_framework.base_test import BaseTestCase
+from pyvcloud.system_test_framework.environment import CommonRoles
 from pyvcloud.system_test_framework.environment import Environment
 from vcd_cli.login import login, logout
 from vcd_cli.role import role
@@ -14,36 +15,44 @@ class TestRole(BaseTestCase):
 
     def test_0000_setup(self):
         self._config = Environment.get_config()
-        TestRole._logger = Environment.get_default_logger()
-        TestRole._runner = CliRunner()
-        self._sys_login()
+        self._logger = Environment.get_default_logger()
+        self._runner = CliRunner()
+        self._org_admin_login()
 
-    def _sys_login(self):
-        """Logs in using admin credentials"""
+    def _org_admin_login(self):
+        """Logs in using org admin credentials"""
         login_args = [
             self._config['vcd']['host'],
-            self._config['vcd']['sys_org_name'],
-            self._config['vcd']['sys_admin_username'],
+            self._config['vcd']['default_org_name'],
+            Environment.get_username_for_role_in_test_org(
+                CommonRoles.ORGANIZATION_ADMINISTRATOR),
             "-i",
             "-w",
-            f"--password={self._config['vcd']['sys_admin_pass']}"
+            f"--password={self._config['vcd']['default_org_user_password']}"
         ]
-        result = TestRole._runner.invoke(login, args=login_args)
+        result = self._runner.invoke(login, args=login_args)
         self.assertEqual(0, result.exit_code)
         self.assertTrue("logged in" in result.output)
 
-        """def test_0010_role_clone(self):
+    def test_0010_role_clone(self):
         # org admin and sys admin can clone roles
         result = self._runner.invoke(
             role,
             args=['clone', ORG_ADMIN_ROLE_NAME, DUMMY_ROLE_NAME])
-        TestRole._logger.debug(f"vcd role clone {ORG_ADMIN_ROLE_NAME} "
-                               f"{DUMMY_ROLE_NAME}: {result.output}")
-        self.assertEqual(0, result.exit_code)"""
+        self._logger.debug(f"vcd role clone {ORG_ADMIN_ROLE_NAME} "
+                           f"{DUMMY_ROLE_NAME}: {result.output}")
+        self.assertEqual(0, result.exit_code)
 
     def _logout(self):
         """Logs out current session, ignoring errors"""
-        TestRole._runner.invoke(logout)
+        self._runner.invoke(logout)
 
     def test_9999_teardown(self):
+        """Delete any created roles"""
+        result = self._runner.invoke(
+            role,
+            args=['delete', DUMMY_ROLE_NAME, '--yes'])
+        self._logger.debug(f"vcd role delete -y {DUMMY_ROLE_NAME}: "
+                           f"{result.output}")
+        self.assertEqual(0, result.exit_code)
         self._logout()