diff --git a/build/integration/capabilities_features/capabilities.feature b/build/integration/capabilities_features/capabilities.feature
new file mode 100644
index 00000000000..4adb884e80a
--- /dev/null
+++ b/build/integration/capabilities_features/capabilities.feature
@@ -0,0 +1,34 @@
+Feature: capabilities
+	Background:
+		Given using api version "1"
+
+	Scenario: getting capabilities with admin user
+		Given As an "admin"
+		When sending "GET" to "/cloud/capabilities"
+		Then the HTTP status code should be "200"
+		And fields of capabilities match with
+			| capability | feature | value_or_subfeature | value |
+			| core | pollinterval | 60 | |
+			| core | webdav-root | remote.php/webdav | |
+			| files_sharing | api_enabled | 1 | |
+			| files_sharing | public | enabled | 1 |
+			| files_sharing | public | password | 1 |
+			| files_sharing | public | expire_date | 1 |
+			| files_sharing | public | send_mail | 1 |
+			| files_sharing | public | upload | 1 |
+			| files_sharing | resharing | 1 | |
+			| files_sharing | federation | outgoing | 1 |
+			| files_sharing | federation | incoming | 1 |
+			| files | bigfilechunking | 1 | |
+			| files | undelete | 1 | |
+			| files | versioning | 1 | |
+
+
+
+
+
+
+
+
+
+
diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml
index 37ed2b117f3..42f5f88ac8a 100644
--- a/build/integration/config/behat.yml
+++ b/build/integration/config/behat.yml
@@ -14,7 +14,7 @@ default:
             regular_user_password: 123456
     federation:
       paths:
-        - %paths.base%/../federation
+        - %paths.base%/../federation_features
       contexts:
         - FederationContext:
             baseUrl:  http://localhost:8080/ocs/
@@ -22,6 +22,17 @@ default:
               - admin
               - admin
             regular_user_password: 123456
+    capabilities:
+      paths:
+        - %paths.base%/../capabilities_features
+      contexts:
+        - CapabilitiesContext:
+            baseUrl:  http://localhost:8080/ocs/
+            admin:
+              - admin
+              - admin
+            regular_user_password: 123456
+
 
 
   extensions:
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
new file mode 100644
index 00000000000..a1a14aa3bb3
--- /dev/null
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -0,0 +1,45 @@
+<?php
+
+use Behat\Behat\Context\Context;
+use Behat\Behat\Context\SnippetAcceptingContext;
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\ResponseInterface;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+/**
+ * Capabilities context.
+ */
+class CapabilitiesContext implements Context, SnippetAcceptingContext {
+
+	use BasicStructure;
+	use Provisioning;
+	use Sharing;
+
+	/**
+	 * @Then /^fields of capabilities match with$/
+	 * @param \Behat\Gherkin\Node\TableNode|null $formData
+	 */
+	public function checkCapabilitiesResponse($formData){
+		if ($formData instanceof \Behat\Gherkin\Node\TableNode) {
+			$fd = $formData->getHash();
+		}
+		
+		$capabilitiesXML = $this->response->xml()->data->capabilities;
+		
+		foreach ($fd as $row) {
+			if ($row['value'] === ''){
+				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature'];
+				if ( !$answeredValue ===  $row['value_or_subfeature']){
+					PHPUnit_Framework_Assert::fail("Answered value $answeredValue is different to expected " . $row['value_or_subfeature']);
+				}
+			} else{
+				$answeredValue = (string)$capabilitiesXML->$row['capability']->$row['feature']->$row['value_or_subfeature']->$row['value'];
+				if ( !$answeredValue ===  $row['value']){
+					PHPUnit_Framework_Assert::fail("Answered value $answeredValue is different to expected " . $row['value']);
+				}
+			}
+		}
+	}
+
+}
diff --git a/build/integration/federation/federated.feature b/build/integration/federation_features/federated.feature
similarity index 100%
rename from build/integration/federation/federated.feature
rename to build/integration/federation_features/federated.feature