diff --git a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py
index 5ff7ff56a62c..344b10090ea5 100644
--- a/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py
+++ b/tools/azure-sdk-tools/devtools_testutils/resource_testcase.py
@@ -63,6 +63,12 @@ def __init__(
         self.set_cache(use_cache, parameter_name, name_prefix)
         self.delete_after_tag_timedelta = delete_after_tag_timedelta
 
+    def _prefix_name(self, name):
+        name = u"rgpy-" + name
+        if len(name) > 90:
+            name = name[:90]
+        return name
+
     def create_resource(self, name, **kwargs):
         if self.is_live and self._need_creation:
             self.client = self.create_mgmt_client(ResourceManagementClient)
@@ -75,13 +81,11 @@ def create_resource(self, name, **kwargs):
             parameters["tags"]["BuildNumber"] = os.environ.get("BUILD_BUILDNUMBER", "local")
             parameters["tags"]["BuildReason"] = os.environ.get("BUILD_REASON", "local")
             try:
+                # Prefixing all RGs created here with 'rgpy-' for tracing purposes
+                name = self._prefix_name(name)
                 logging.info(
                     "Attempting to create a Resource Group with name {} and parameters {}".format(name, parameters)
                 )
-                # Prefixing all RGs created here with 'rgpy-' for tracing purposes
-                name = u"rgpy-" + name
-                if len(name) > 90:
-                    name = name[:90]
                 self.resource = self.client.resource_groups.create_or_update(name, parameters)
             except Exception as ex:
                 if "ReservedResourceName" in str(ex):
@@ -101,6 +105,7 @@ def create_resource(self, name, **kwargs):
 
     def remove_resource(self, name, **kwargs):
         if self.is_live and self._need_creation:
+            name = self._prefix_name(name)
             try:
                 if "wait_timeout" in kwargs:
                     azure_poller = self.client.resource_groups.begin_delete(name)