diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php
index 91b2edf14b17752c53463c833142caad721fa87d..817d7eae54f2270ec6ff3103a68ab78eceac455c 100644
--- a/apps/settings/tests/Settings/Admin/SharingTest.php
+++ b/apps/settings/tests/Settings/Admin/SharingTest.php
@@ -131,6 +131,21 @@ class SharingTest extends TestCase {
 			->method('getAppValue')
 			->with('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL)
 			->willReturn(Constants::PERMISSION_ALL);
+		$this->config
+			->expects($this->at(14))
+			->method('getAppValue')
+			->with('core', 'shareapi_default_internal_expire_date', 'no')
+			->willReturn('no');
+		$this->config
+			->expects($this->at(15))
+			->method('getAppValue')
+			->with('core', 'shareapi_internal_expire_after_n_days', '7')
+			->willReturn('7');
+		$this->config
+			->expects($this->at(16))
+			->method('getAppValue')
+			->with('core', 'shareapi_enforce_internal_expire_date', 'no')
+			->willReturn('no');
 
 		$expected = new TemplateResponse(
 			'settings',
@@ -152,7 +167,10 @@ class SharingTest extends TestCase {
 				'publicShareDisclaimerText'       => 'Lorem ipsum',
 				'enableLinkPasswordByDefault'     => 'yes',
 				'shareApiDefaultPermissions'      => Constants::PERMISSION_ALL,
-				'shareApiDefaultPermissionsCheckboxes' => $this->invokePrivate($this->admin, 'getSharePermissionList', [])
+				'shareApiDefaultPermissionsCheckboxes' => $this->invokePrivate($this->admin, 'getSharePermissionList', []),
+				'shareDefaultInternalExpireDateSet' => 'no',
+				'shareInternalExpireAfterNDays' => '7',
+				'shareInternalEnforceExpireDate' => 'no',
 			],
 			''
 		);
@@ -231,6 +249,21 @@ class SharingTest extends TestCase {
 			->method('getAppValue')
 			->with('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL)
 			->willReturn(Constants::PERMISSION_ALL);
+		$this->config
+			->expects($this->at(14))
+			->method('getAppValue')
+			->with('core', 'shareapi_default_internal_expire_date', 'no')
+			->willReturn('no');
+		$this->config
+			->expects($this->at(15))
+			->method('getAppValue')
+			->with('core', 'shareapi_internal_expire_after_n_days', '7')
+			->willReturn('7');
+		$this->config
+			->expects($this->at(16))
+			->method('getAppValue')
+			->with('core', 'shareapi_enforce_internal_expire_date', 'no')
+			->willReturn('no');
 
 
 		$expected = new TemplateResponse(
@@ -253,7 +286,10 @@ class SharingTest extends TestCase {
 				'publicShareDisclaimerText'       => 'Lorem ipsum',
 				'enableLinkPasswordByDefault'     => 'yes',
 				'shareApiDefaultPermissions'      => Constants::PERMISSION_ALL,
-				'shareApiDefaultPermissionsCheckboxes' => $this->invokePrivate($this->admin, 'getSharePermissionList', [])
+				'shareApiDefaultPermissionsCheckboxes' => $this->invokePrivate($this->admin, 'getSharePermissionList', []),
+				'shareDefaultInternalExpireDateSet' => 'no',
+				'shareInternalExpireAfterNDays' => '7',
+				'shareInternalEnforceExpireDate' => 'no',
 			],
 			''
 		);
diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php
index 3e34a64acf3b6a618ee0d9b13c96bf7d4cd0131b..9b8798b2a56d5b708affaa0d562da747c493f6f7 100644
--- a/tests/lib/Share20/ManagerTest.php
+++ b/tests/lib/Share20/ManagerTest.php
@@ -1743,7 +1743,8 @@ class ManagerTest extends \Test\TestCase {
 			->with($path);
 		$manager->expects($this->once())
 			->method('validateExpirationDate')
-			->with($share);
+			->with($share)
+			->willReturn($share);
 		$manager->expects($this->once())
 			->method('verifyPassword')
 			->with('password');