diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
index cf396f600..7a0154833 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
@@ -92,7 +92,7 @@ public static void setUpBeforeClass() throws Exception {
     };
     addRangePathIndex(dbName, rangePaths);
 
-    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
+    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
     createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user", "manage-user");
   }
 
diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java
index 53cdd8870..888631b69 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteWithTransformations.java
@@ -54,7 +54,7 @@ public static void tearDownAfterClass() throws Exception {
   @BeforeEach
   public void setUp() throws Exception {
     // create new connection for each test below
-    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
+    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri", "xdbc:invoke");
     createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader");
 	client = newClientAsUser("eval-user", "x");
   }
diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestJSResourceExtensions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestJSResourceExtensions.java
index 6b77663ef..8eda2cfa4 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestJSResourceExtensions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestJSResourceExtensions.java
@@ -112,7 +112,7 @@ public String deleteJSON(String docUri) {
 
   @BeforeAll
   public static void setUpBeforeClass() throws Exception {
-    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke", "xdmp-login");
+    createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:value", "xdmp:eval", "xdmp:eval-in", "any-uri", "xdbc:invoke");
     createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "rest-extension-user");
   }
 
diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
index 2cdf136b5..1fdfe67d6 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
@@ -121,7 +121,7 @@ public static void tearDownAfterClass() throws Exception {
   @BeforeEach
   public void setUp() throws Exception {
     createUserRolesWithPrevilages("test-eval", "xdbc:eval", "xdbc:eval-in", "xdmp:eval-in", "any-uri",
-        "xdbc:invoke", "temporal:statement-set-system-time", "xdmp-login");
+        "xdbc:invoke", "temporal:statement-set-system-time");
     createRESTUser("eval-user", "x", "test-eval", "rest-admin", "rest-writer", "rest-reader", "temporal-admin");
 
     adminClient = getDatabaseClient("rest-admin", "x", getConnType());
diff --git a/test-app/src/main/ml-config/security/roles/java-test-xdmp-login.json b/test-app/src/main/ml-config/security/roles/java-test-xdmp-login.json
deleted file mode 100644
index e23c8407c..000000000
--- a/test-app/src/main/ml-config/security/roles/java-test-xdmp-login.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-	"role-name": "java-test-xdmp-login",
-	"description": "Grants privileges required in ML 11 for invoking server-side transforms and resource extensions",
-	"privilege": [
-		{
-			"privilege-name": "xdmp-login",
-			"action": "http://marklogic.com/xdmp/privileges/xdmp-login",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "rest-reader",
-			"action": "http://marklogic.com/xdmp/privileges/rest-reader",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "xdmp:xslt-eval",
-			"action": "http://marklogic.com/xdmp/privileges/xslt-eval",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "xdmp:xslt-invoke",
-			"action": "http://marklogic.com/xdmp/privileges/xslt-invoke",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "xdmp:invoke",
-			"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "unprotected-uri",
-			"action": "http://marklogic.com/xdmp/privileges/unprotected-uri",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "unprotected-collections",
-			"action": "http://marklogic.com/xdmp/privileges/unprotected-collections",
-			"kind": "execute"
-		},
-		{
-			"privilege-name": "xdmp:value",
-			"action": "http://marklogic.com/xdmp/privileges/xdmp-value",
-			"kind": "execute"
-		}
-	]
-}
diff --git a/test-app/src/main/ml-config/security/roles/test-rest-writer.json b/test-app/src/main/ml-config/security/roles/test-rest-writer.json
index 156eb7355..1039557a2 100644
--- a/test-app/src/main/ml-config/security/roles/test-rest-writer.json
+++ b/test-app/src/main/ml-config/security/roles/test-rest-writer.json
@@ -17,11 +17,6 @@
 			"action": "http://marklogic.com/xdmp/privileges/rest-tracer",
 			"kind": "execute"
 		},
-		{
-			"privilege-name": "xdmp-login",
-			"action": "http://marklogic.com/xdmp/privileges/xdmp-login",
-			"kind": "execute"
-		},
 		{
 			"privilege-name": "xdmp:invoke",
 			"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke",
diff --git a/test-app/src/main/ml-config/security/users/rest-admin.json b/test-app/src/main/ml-config/security/users/rest-admin.json
index 6cdf8c9fb..28fcba597 100644
--- a/test-app/src/main/ml-config/security/users/rest-admin.json
+++ b/test-app/src/main/ml-config/security/users/rest-admin.json
@@ -1,6 +1,9 @@
 {
-  "user-name": "rest-admin",
-  "description": "rest-admin user",
-  "role": ["rest-admin", "java-test-delete-temporal", "java-test-xdmp-login"],
-  "password": "x"
+	"user-name": "rest-admin",
+	"description": "rest-admin user",
+	"role": [
+		"rest-admin",
+		"java-test-delete-temporal"
+	],
+	"password": "x"
 }
diff --git a/test-app/src/main/ml-config/security/users/rest-evaluator.json b/test-app/src/main/ml-config/security/users/rest-evaluator.json
index c2d5b3449..a302bd2ce 100644
--- a/test-app/src/main/ml-config/security/users/rest-evaluator.json
+++ b/test-app/src/main/ml-config/security/users/rest-evaluator.json
@@ -1,6 +1,8 @@
 {
-  "user-name": "rest-evaluator",
-  "description": "Test user for the java-client-api-project",
-  "role": ["java-test-evaluator", "java-test-xdmp-login"],
-  "password": "x"
+	"user-name": "rest-evaluator",
+	"description": "Test user for the java-client-api-project",
+	"role": [
+		"java-test-evaluator"
+	],
+	"password": "x"
 }
diff --git a/test-app/src/main/ml-config/security/users/rest-transform-user.json b/test-app/src/main/ml-config/security/users/rest-transform-user.json
deleted file mode 100644
index 591446bc3..000000000
--- a/test-app/src/main/ml-config/security/users/rest-transform-user.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "user-name": "rest-transform-user",
-  "description": "REST API transform execution user",
-  "password": "x",
-  "role": [
-    "rest-transform-internal",
-    "rest-reader",
-    "rest-writer",
-    "java-test-xdmp-login"
-  ],
-  "permission": [
-    { "role-name": "rest-reader", "capability": "read" },
-    { "role-name": "rest-writer", "capability": "update" }
-  ]
-}
diff --git a/test-app/src/main/ml-config/security/users/rest-writer.json b/test-app/src/main/ml-config/security/users/rest-writer.json
index ba434365c..d9aee147b 100644
--- a/test-app/src/main/ml-config/security/users/rest-writer.json
+++ b/test-app/src/main/ml-config/security/users/rest-writer.json
@@ -1,6 +1,9 @@
 {
-  "user-name": "rest-writer",
-  "description": "rest-writer user",
-  "role": ["rest-writer", "java-test-delete-graph", "java-test-xdmp-login"],
-  "password": "x"
+	"user-name": "rest-writer",
+	"description": "rest-writer user",
+	"role": [
+		"rest-writer",
+		"java-test-delete-graph"
+	],
+	"password": "x"
 }
diff --git a/test-app/src/main/ml-config/security/users/writer-no-default-permissions.json b/test-app/src/main/ml-config/security/users/writer-no-default-permissions.json
index e6d56ea40..9cfc04711 100644
--- a/test-app/src/main/ml-config/security/users/writer-no-default-permissions.json
+++ b/test-app/src/main/ml-config/security/users/writer-no-default-permissions.json
@@ -1,12 +1,11 @@
 {
-  "user-name": "writer-no-default-permissions",
-  "description": "test user that does not have the rest-writer role so as to avoid having default permissions",
-  "role": [
-    "test-rest-writer",
-    "java-test-delete-graph",
-    "rest-extension-user",
-    "rest-reader",
-    "java-test-xdmp-login"
-  ],
-  "password": "x"
+	"user-name": "writer-no-default-permissions",
+	"description": "test user that does not have the rest-writer role so as to avoid having default permissions",
+	"role": [
+		"test-rest-writer",
+		"java-test-delete-graph",
+		"rest-extension-user",
+		"rest-reader"
+	],
+	"password": "x"
 }