diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 8d1d3b38793..171de3dc476 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -72,6 +72,18 @@ trait BasicStructure {
 		}
 	}
 
+	/**
+	 * @BeforeScenario
+	 */
+	public function resetAuthState(): void {
+		$this->currentUser = '';
+		$this->currentServer = 'LOCAL';
+		$this->baseUrl = $this->localBaseUrl;
+		$this->apiVersion = 1;
+		$this->requestToken = null;
+		$this->cookieJar = new CookieJar();
+	}
+
 	/**
 	 * @Given /^using api version "(\d+)"$/
 	 */
diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php
index 98ecce66832..4d5b78dd05e 100644
--- a/build/integration/features/bootstrap/Sharing.php
+++ b/build/integration/features/bootstrap/Sharing.php
@@ -23,6 +23,15 @@ trait Sharing {
 	/** @var SimpleXMLElement[] */
 	private array $storedShareData = [];
 	private ?string $savedShareId = null;
+
+	/**
+	 * @BeforeScenario
+	 */
+	public function resetSharingState(): void {
+		$this->lastShareData = null;
+		$this->storedShareData = [];
+		$this->savedShareId = null;
+	}
 	/** @var ResponseInterface */
 	private $response;