diff --git a/composer.json b/composer.json
index 31a83f0..8844d25 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"cs:fix": "php-cs-fixer fix",
 		"psalm": "psalm --threads=1 --no-cache",
-		"test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
+		"test:unit": "phpunit -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
+		"test:integration": "phpunit -c tests/phpunit.integration.xml --colors=always",
 		"openapi": "generate-spec",
 		"rector": "rector && composer cs:fix"
 	},
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index a8c6535..b00a4d4 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -9,6 +9,7 @@
 
 namespace OCA\NcwTools\AppInfo;
 
+use OCA\NcwTools\Capabilities;
 use OCA\NcwTools\Listeners\InstallationCompletedEventListener;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -25,6 +26,7 @@ public function __construct() {
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(InstallationCompletedEvent::class, InstallationCompletedEventListener::class);
+		$context->registerCapability(Capabilities::class);
 	}
 
 	public function boot(IBootContext $context): void {
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
new file mode 100644
index 0000000..6b42d64
--- /dev/null
+++ b/lib/Capabilities.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 STRATO GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+declare(strict_types=1);
+
+namespace OCA\NcwTools;
+
+use OCP\Capabilities\ICapability;
+
+class Capabilities implements ICapability {
+	/**
+	 * Override support capabilities to always show valid subscription
+	 * This ensures the support capability is present even if the support app
+	 * returns an empty array when subscription check fails.
+	 *
+	 * @return array{
+	 *     support: array{
+	 *         hasValidSubscription: bool,
+	 *         desktopEnterpriseChannel?: string,
+	 *     }
+	 * }
+	 */
+	public function getCapabilities(): array {
+		return [
+			'support' => [
+				'hasValidSubscription' => true,
+				'desktopEnterpriseChannel' => 'stable',
+			],
+		];
+	}
+}
diff --git a/tests/integration/CapabilitiesIntegrationTest.php b/tests/integration/CapabilitiesIntegrationTest.php
new file mode 100644
index 0000000..18b2b97
--- /dev/null
+++ b/tests/integration/CapabilitiesIntegrationTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 STRATO GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+declare(strict_types=1);
+
+namespace OCA\NcwTools\Tests\Integration;
+
+use OC\CapabilitiesManager;
+use OCA\NcwTools\Capabilities;
+use Psr\Log\LoggerInterface;
+use Test\TestCase;
+
+/**
+ * Integration test to verify that the ncw_tools Capabilities class
+ * properly overrides the support.hasValidSubscription value in the
+ * actual Nextcloud capabilities system.
+ *
+ * @group DB
+ */
+class CapabilitiesIntegrationTest extends TestCase {
+	private CapabilitiesManager $capabilitiesManager;
+	private LoggerInterface $logger;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->logger = $this->createMock(LoggerInterface::class);
+		// Create a fresh CapabilitiesManager for isolation
+		$this->capabilitiesManager = new CapabilitiesManager($this->logger);
+	}
+
+	public function testCapabilityIsRegisteredInSystem(): void {
+		// Register our capability
+		$this->capabilitiesManager->registerCapability(function () {
+			return new Capabilities();
+		});
+
+		$capabilities = $this->capabilitiesManager->getCapabilities();
+
+		// Verify the support capability exists
+		$this->assertArrayHasKey('support', $capabilities, 'Support capability should be present');
+		$this->assertArrayHasKey('hasValidSubscription', $capabilities['support'], 'hasValidSubscription should be present');
+	}
+
+	public function testHasValidSubscriptionIsSetToFalse(): void {
+		// Register our capability
+		$this->capabilitiesManager->registerCapability(function () {
+			return new Capabilities();
+		});
+
+		$capabilities = $this->capabilitiesManager->getCapabilities();
+
+		// Verify the value is true
+		$this->assertTrue(
+			$capabilities['support']['hasValidSubscription'],
+			'hasValidSubscription should be true as set by ncw_tools'
+		);
+	}
+
+	public function testCapabilityOverridesOtherApps(): void {
+		// Simulate another app setting hasValidSubscription to true
+		$this->capabilitiesManager->registerCapability(function () {
+			return new class implements \OCP\Capabilities\ICapability {
+				public function getCapabilities() {
+					return [
+						'support' => [
+							'hasValidSubscription' => true,
+						],
+					];
+				}
+			};
+		});
+
+		// Now register our capability that should also set it to true
+		$this->capabilitiesManager->registerCapability(function () {
+			return new Capabilities();
+		});
+
+		$capabilities = $this->capabilitiesManager->getCapabilities();
+
+		// Verify it's true
+		$this->assertTrue(
+			$capabilities['support']['hasValidSubscription'],
+			'ncw_tools should ensure hasValidSubscription is true'
+		);
+	}
+}
diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
new file mode 100644
index 0000000..3cba3ce
--- /dev/null
+++ b/tests/phpunit.integration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  - SPDX-FileCopyrightText: 2026 STRATO GmbH
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+  -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="bootstrap.php"
+         timeoutForSmallTests="900"
+         timeoutForMediumTests="900"
+         timeoutForLargeTests="900"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         cacheDirectory=".phpunit.cache">
+	<testsuite name="NCW Tools Integration Tests">
+		<directory suffix="Test.php">./integration</directory>
+	</testsuite>
+	<source>
+		<include>
+			<directory suffix=".php">../appinfo</directory>
+			<directory suffix=".php">../lib</directory>
+		</include>
+	</source>
+</phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 28b6835..7cc3223 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" timeoutForSmallTests="900" timeoutForMediumTests="900" timeoutForLargeTests="900" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache">
-	<testsuite name="NCW Tools Tests">
-		<directory suffix="Test.php">.</directory>
+	<testsuite name="NCW Tools Unit Tests">
+		<directory suffix="Test.php">./unit</directory>
+		<exclude>./integration</exclude>
 	</testsuite>
 	<source>
 		<include>
diff --git a/tests/unit/CapabilitiesTest.php b/tests/unit/CapabilitiesTest.php
new file mode 100644
index 0000000..fc19757
--- /dev/null
+++ b/tests/unit/CapabilitiesTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 STRATO GmbH
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+declare(strict_types=1);
+
+namespace OCA\NcwTools\Tests\Unit;
+
+use OCA\NcwTools\Capabilities;
+use Test\TestCase;
+
+class CapabilitiesTest extends TestCase {
+	private Capabilities $capabilities;
+
+	protected function setUp(): void {
+		parent::setUp();
+		$this->capabilities = new Capabilities();
+	}
+
+	public function testGetCapabilities(): void {
+		$expected = [
+			'support' => [
+				'hasValidSubscription' => true,
+				'desktopEnterpriseChannel' => 'stable',
+			],
+		];
+
+		$this->assertSame($expected, $this->capabilities->getCapabilities());
+	}
+
+	public function testImplementsICapabilityInterface(): void {
+		$this->assertInstanceOf(\OCP\Capabilities\ICapability::class, $this->capabilities);
+	}
+}