diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
index cd48d44c8a..08dbfc4399 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java
@@ -21,6 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.test;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.alfresco.module.org_alfresco_module_rm.test.service.CapabilityServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.DataSetServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.DispositionServiceImplTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedSecurityServiceImplTest;
@@ -37,17 +38,17 @@ import org.alfresco.module.org_alfresco_module_rm.test.service.VitalRecordServic
 
 /**
  * RM test suite
- * 
+ *
  * @author Roy Wetherall
  */
 public class ServicesTestSuite extends TestSuite
 {
     /**
      * Creates the test suite
-     * 
+     *
      * @return  the test suite
      */
-    public static Test suite() 
+    public static Test suite()
     {
         TestSuite suite = new TestSuite();
         suite.addTestSuite(ExtendedSecurityServiceImplTest.class);
@@ -64,6 +65,7 @@ public class ServicesTestSuite extends TestSuite
         suite.addTestSuite(DataSetServiceImplTest.class);
         suite.addTestSuite(FreezeServiceImplTest.class);
         suite.addTestSuite(RecordServiceImplTest.class);
+        suite.addTestSuite(CapabilityServiceImplTest.class);
         return suite;
     }
 }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilityServiceTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
similarity index 80%
rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilityServiceTest.java
rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
index 66b3deb14c..6a65821f94 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilityServiceTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java
@@ -16,7 +16,7 @@
  * 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.capabilities;
+package org.alfresco.module.org_alfresco_module_rm.test.service;
 
 import java.util.List;
 
@@ -32,8 +32,60 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
  * @author Tuna Aksoy
  * @since 2.1
  */
-public class CapabilityServiceTest extends BaseRMTestCase
+public class CapabilityServiceImplTest extends BaseRMTestCase
 {
+    public void testGetCapability() throws Exception
+    {
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                // FIXME
+                return null;
+            }
+        });
+    }
+
+    public void testGetCapabilities() throws Exception
+    {
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                // FIXME
+                return null;
+            }
+        });
+    }
+
+    public void testGetCapabilityAccessState() throws Exception
+    {
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                // FIXME
+                return null;
+            }
+        });
+    }
+
+    public void testGetCapabilitiesAccessState() throws Exception
+    {
+        doTestInTransaction(new Test<Void>()
+        {
+            @Override
+            public Void run() throws Exception
+            {
+                // FIXME
+                return null;
+            }
+        });
+    }
+
     public void testGetAddRemoveGroups() throws Exception
     {
         doTestInTransaction(new Test<Void>()