diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java
new file mode 100644
index 0000000000..f35a590185
--- /dev/null
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+
+import java.io.IOException;
+
+import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * REST API Test for Capabilities
+ *
+ * @author Tuna Aksoy
+ * @since 2.1
+ */
+public class CapabilitiesRestApiTest extends BaseRMWebScriptTestCase
+{
+    /** URLs for the REST API */
+    private static final String GET_CAPABILITIES_URL = "/api/capabilities?";
+
+    /**
+     * Tests the REST API to get the list of capabilities
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    public void testGetCapabilitiesAction() throws IOException, JSONException
+    {
+        // Format url and send request
+        String getUrl = String.format(GET_CAPABILITIES_URL + "includeAll=%s", true);
+        Response getResponse = sendRequest(new GetRequest(getUrl), Status.STATUS_OK);
+
+        // Check the content from the response
+        String getContentAsString = getResponse.getContentAsString();
+        assertNotNull(getContentAsString);
+
+        // Convert the response to json and check the data
+        JSONObject getContentAsJson = new JSONObject(getContentAsString);
+        JSONObject getData = getContentAsJson.getJSONObject("data");
+        assertNotNull(getData);
+
+        // Get the capabilities and check them
+        JSONArray getDataSets = getData.getJSONArray("capabilities");
+        assertNotNull(getDataSets);
+
+        // Format url and send another request with different parameter
+        getUrl = String.format(GET_CAPABILITIES_URL + "grouped=%s", true);
+        getResponse = sendRequest(new GetRequest(getUrl), Status.STATUS_OK);
+
+        // Check the content from the response
+        getContentAsString = getResponse.getContentAsString();
+        assertNotNull(getContentAsString);
+
+        // If both parameters are specified the result should be the same with only specifying the "grouped" parameter
+        getUrl = String.format(GET_CAPABILITIES_URL + "includeAll=%s&amp;grouped=%s", true, true);
+        getResponse = sendRequest(new GetRequest(getUrl), Status.STATUS_OK);
+        getContentAsString.equalsIgnoreCase(getResponse.getContentAsString());
+
+        // Convert the response to json and check the data
+        getContentAsJson = new JSONObject(getContentAsString);
+        getData = getContentAsJson.getJSONObject("data");
+        assertNotNull(getData);
+
+        // Get the grouped capabilities and check them
+        getDataSets = getData.getJSONArray("groupedCapabilities");
+        assertNotNull(getDataSets);
+
+        // Check the JSON structure
+        int length = getDataSets.length();
+        if (length > 0)
+        {
+            for (int i = 0; i < length; i++)
+            {
+                JSONObject jsonObject = getDataSets.getJSONObject(i);
+                String key = (String) jsonObject.keys().next();
+                JSONObject value = jsonObject.getJSONObject(key);
+                assertNotNull(value.getString("groupTitle"));
+                assertNotNull(value.getJSONObject("capabilities"));
+            }
+        }
+    }
+}
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java
new file mode 100644
index 0000000000..6f1f69df2f
--- /dev/null
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+
+import java.io.IOException;
+
+import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
+import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
+
+/**
+ * REST API Test for Email mapping keys
+ *
+ * @author Tuna Aksoy
+ * @since 2.1
+ */
+public class EmailMapKeysRestApiTest extends BaseRMWebScriptTestCase
+{
+    /** URLs for the REST API */
+    private static final String GET_EMAIL_MAP_KEYS_URL = "/api/rma/admin/emailmapkeys";
+
+    /**
+     * Tests the REST API to get the list of email mapping keys
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    public void testGetCapabilitiesAction() throws IOException, JSONException
+    {
+        // Send request
+        Response response = sendRequest(new GetRequest(GET_EMAIL_MAP_KEYS_URL), Status.STATUS_OK);
+
+        // Check the content from the response
+        String contentAsString = response.getContentAsString();
+        assertNotNull(contentAsString);
+
+        // Convert the response to json and check the data
+        JSONObject contentAsJson = new JSONObject(contentAsString);
+        JSONObject data = contentAsJson.getJSONObject("data");
+        assertNotNull(data);
+
+        // Get the email mapping keys and check them
+        JSONArray dataSets = data.getJSONArray("emailmapkeys");
+        assertNotNull(dataSets);
+
+        // Check the number of email mapping keys
+        assertTrue(dataSets.length() == 6);
+    }
+}