diff --git a/build/integration/features/bootstrap/AppConfiguration.php b/build/integration/features/bootstrap/AppConfiguration.php
new file mode 100644
index 0000000000..af904a3089
--- /dev/null
+++ b/build/integration/features/bootstrap/AppConfiguration.php
@@ -0,0 +1,103 @@
+<?php
+
+use Behat\Behat\Hook\Scope\AfterScenarioScope;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use GuzzleHttp\Message\ResponseInterface;
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+trait AppConfiguration {
+	/** @var string */
+	private $currentUser = '';
+
+	/** @var ResponseInterface */
+	private $response = null;
+
+	abstract public function sendingTo($verb, $url);
+	abstract public function sendingToWith($verb, $url, $body);
+	abstract public function theOCSStatusCodeShouldBe($statusCode);
+	abstract public function theHTTPStatusCodeShouldBe($statusCode);
+
+	/**
+	 * @Given /^parameter "([^"]*)" of app "([^"]*)" is set to "([^"]*)"$/
+	 * @param string $parameter
+	 * @param string $app
+	 * @param string $value
+	 */
+	public function serverParameterIsSetTo($parameter, $app, $value) {
+		$user = $this->currentUser;
+		$this->currentUser = 'admin';
+
+		$this->modifyServerConfig($app, $parameter, $value);
+
+		$this->currentUser = $user;
+	}
+
+	/**
+	 * @param string $app
+	 * @param string $parameter
+	 * @param string $value
+	 */
+	protected function modifyServerConfig($app, $parameter, $value) {
+		$body = new \Behat\Gherkin\Node\TableNode([['value', $value]]);
+		$this->sendingToWith('post', "/apps/testing/api/v1/app/{$app}/{$parameter}", $body);
+		$this->theHTTPStatusCodeShouldBe('200');
+		$this->theOCSStatusCodeShouldBe('100');
+	}
+
+	protected function setStatusTestingApp($enabled) {
+		$this->sendingTo(($enabled ? 'post' : 'delete'), '/cloud/apps/testing');
+		$this->theHTTPStatusCodeShouldBe('200');
+		$this->theOCSStatusCodeShouldBe('100');
+
+		$this->sendingTo('get', '/cloud/apps?filter=enabled');
+		$this->theHTTPStatusCodeShouldBe('200');
+		if ($enabled) {
+			PHPUnit_Framework_Assert::assertContains('testing', $this->response->getBody()->getContents());
+		} else {
+			PHPUnit_Framework_Assert::assertNotContains('testing', $this->response->getBody()->getContents());
+		}
+	}
+
+	abstract protected function resetAppConfigs();
+
+	/**
+	 * @BeforeScenario
+	 *
+	 * Enable the testing app before the first scenario of the feature and
+	 * reset the configs before each scenario
+	 * @param BeforeScenarioScope $event
+	 */
+	public function prepareParameters(BeforeScenarioScope $event){
+		$user = $this->currentUser;
+		$this->currentUser = 'admin';
+
+		$scenarios = $event->getFeature()->getScenarios();
+		if ($event->getScenario() === reset($scenarios)) {
+			$this->setStatusTestingApp(true);
+		}
+
+		$this->resetAppConfigs();
+
+		$this->currentUser = $user;
+	}
+
+	/**
+	 * @AfterScenario
+	 *
+	 * Reset the values after the last scenario of the feature and disable the testing app
+	 * @param AfterScenarioScope $event
+	 */
+	public function undoChangingParameters(AfterScenarioScope $event) {
+		$scenarios = $event->getFeature()->getScenarios();
+		if ($event->getScenario() === end($scenarios)) {
+			$user = $this->currentUser;
+			$this->currentUser = 'admin';
+
+			$this->resetAppConfigs();
+
+			$this->setStatusTestingApp(false);
+			$this->currentUser = $user;
+		}
+	}
+}
diff --git a/build/integration/features/bootstrap/CapabilitiesContext.php b/build/integration/features/bootstrap/CapabilitiesContext.php
index 0eb6353a89..91a4265504 100644
--- a/build/integration/features/bootstrap/CapabilitiesContext.php
+++ b/build/integration/features/bootstrap/CapabilitiesContext.php
@@ -15,18 +15,7 @@ require __DIR__ . '/../../vendor/autoload.php';
 class CapabilitiesContext implements Context, SnippetAcceptingContext {
 
 	use BasicStructure;
-
-	/**
-	 * @Given /^parameter "([^"]*)" of app "([^"]*)" is set to "([^"]*)"$/
-	 */
-	public function serverParameterIsSetTo($parameter, $app, $value){
-		$user = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		$this->modifyServerConfig($app, $parameter, $value);
-
-		$this->currentUser = $user;
-	}
+	use AppConfiguration;
 
 	/**
 	 * @Then /^fields of capabilities match with$/
@@ -63,70 +52,4 @@ class CapabilitiesContext implements Context, SnippetAcceptingContext {
 		$this->modifyServerConfig('core', 'shareapi_default_expire_date', 'no');
 		$this->modifyServerConfig('core', 'shareapi_enforce_expire_date', 'no');
 	}
-
-	/**
-	 * @BeforeScenario
-	 *
-	 * Enable the testing app before the first scenario of the feature and
-	 * reset the configs before each scenario
-	 * @param BeforeScenarioScope $event
-	 */
-	public function prepareParameters(BeforeScenarioScope $event){
-		$user = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		$scenarios = $event->getFeature()->getScenarios();
-		if ($event->getScenario() === reset($scenarios)) {
-			$this->setStatusTestingApp(true);
-		}
-
-		$this->resetAppConfigs();
-
-		$this->currentUser = $user;
-	}
-
-	/**
-	 * @AfterScenario
-	 *
-	 * Reset the values after the last scenario of the feature and disable the testing app
-	 * @param AfterScenarioScope $event
-	 */
-	public function undoChangingParameters(AfterScenarioScope $event) {
-		$scenarios = $event->getFeature()->getScenarios();
-		if ($event->getScenario() === end($scenarios)) {
-			$user = $this->currentUser;
-			$this->currentUser = 'admin';
-
-			$this->resetAppConfigs();
-
-			$this->setStatusTestingApp(false);
-			$this->currentUser = $user;
-		}
-	}
-
-	/**
-	 * @param string $app
-	 * @param string $parameter
-	 * @param string $value
-	 */
-	protected function modifyServerConfig($app, $parameter, $value) {
-		$body = new \Behat\Gherkin\Node\TableNode([['value', $value]]);
-		$this->sendingToWith('post', "/apps/testing/api/v1/app/{$app}/{$parameter}", $body);
-		$this->theHTTPStatusCodeShouldBe('200');
-		$this->theOCSStatusCodeShouldBe('100');
-	}
-
-	protected function setStatusTestingApp($enabled) {
-		$this->sendingTo(($enabled ? 'post' : 'delete'), '/cloud/apps/testing');
-		$this->theHTTPStatusCodeShouldBe('200');
-		$this->theOCSStatusCodeShouldBe('100');
-
-		$this->sendingTo('get', '/cloud/apps?filter=enabled');
-		$this->theHTTPStatusCodeShouldBe('200');
-		if ($enabled) {
-			PHPUnit_Framework_Assert::assertContains('testing', $this->response->getBody()->getContents());
-		} else {
-			PHPUnit_Framework_Assert::assertNotContains('testing', $this->response->getBody()->getContents());
-		}
-	}
 }