diff --git a/lib/private/app/codecheckvisitor.php b/lib/private/app/codecheckvisitor.php
index 0dec5b3715d5ea09a38f20d50133043c954ed082..2d0569e8324a7127d57c5dde451c9b3b0d613a60 100644
--- a/lib/private/app/codecheckvisitor.php
+++ b/lib/private/app/codecheckvisitor.php
@@ -38,14 +38,19 @@ class CodeCheckVisitor extends NodeVisitorAbstract {
 
 	/**
 	 * @param string $blackListDescription
-	 * @param string[] $blackListedClassNames
+	 * @param array $blackListedClassNames
 	 * @param bool $checkEqualOperatorUsage
 	 */
 	public function __construct($blackListDescription, $blackListedClassNames, $checkEqualOperatorUsage) {
 		$this->blackListDescription = $blackListDescription;
 
 		$this->blackListedClassNames = [];
-		foreach ($blackListedClassNames as $class) {
+		foreach ($blackListedClassNames as $class => $blackListInfo) {
+			if (is_numeric($class) && is_string($blackListInfo)) {
+				$class = $blackListInfo;
+				$blackListInfo = null;
+			}
+
 			$class = strtolower($class);
 			$this->blackListedClassNames[$class] = $class;
 		}
diff --git a/lib/private/app/deprecationcodechecker.php b/lib/private/app/deprecationcodechecker.php
index c89428927c139495224b7d635a5d8c97044b6b2a..32ae4e7d7ba3d1f10e1607fae9a3589de74fb577 100644
--- a/lib/private/app/deprecationcodechecker.php
+++ b/lib/private/app/deprecationcodechecker.php
@@ -33,12 +33,12 @@ class DeprecationCodeChecker extends CodeChecker {
 
 	protected $blackListedClassNames = [
 		// Deprecated classes
-		'OCP\IConfig',
-		'OCP\Contacts',
-		'OCP\DB',
-		'OCP\IHelper',
-		'OCP\JSON',
-		'OCP\Response',
-		'OCP\AppFramework\IApi',
+		'OCP\Config' => '8.0.0',
+		'OCP\Contacts' => '8.1.0',
+		'OCP\DB' => '8.1.0',
+		'OCP\IHelper' => '8.1.0',
+		'OCP\JSON' => '8.1.0',
+		'OCP\Response' => '8.1.0',
+		'OCP\AppFramework\IApi' => '8.0.0',
 	];
 }