diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
index aa159d23a4..1b9403b7c5 100644
--- a/src/PhpDoc/TypeNodeResolver.php
+++ b/src/PhpDoc/TypeNodeResolver.php
@@ -235,9 +235,11 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 			case 'class-string':
 			case 'interface-string':
 			case 'trait-string':
-			case 'enum-string':
 				return new ClassStringType();
 
+			case 'enum-string':
+				return new GenericClassStringType(new ObjectType('UnitEnum'));
+
 			case 'callable-string':
 				return new IntersectionType([new StringType(), new CallableType()]);
 
@@ -704,6 +706,13 @@ static function (string $variance): TemplateTypeVariance {
 				}
 			}
 
+			return new ErrorType();
+		} elseif ($mainTypeName === 'enum-string') {
+			if (count($genericTypes) === 1) {
+				$genericType = $genericTypes[0];
+				return new GenericClassStringType(TypeCombinator::intersect($genericType, new ObjectType('UnitEnum')));
+			}
+
 			return new ErrorType();
 		} elseif ($mainTypeName === 'int') {
 			if (count($genericTypes) === 2) { // int<min, max>, int<1, 3>
diff --git a/tests/PHPStan/Analyser/nsrt/more-type-strings-php8.php b/tests/PHPStan/Analyser/nsrt/more-type-strings-php8.php
new file mode 100644
index 0000000000..d81c6e9907
--- /dev/null
+++ b/tests/PHPStan/Analyser/nsrt/more-type-strings-php8.php
@@ -0,0 +1,48 @@
+<?php // lint >= 8.1
+
+namespace MoreTypeStringsPhp8;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param interface-string $interfaceString
+	 * @param trait-string $traitString
+	 * @param interface-string<Foo> $genericInterfaceString
+	 * @param trait-string<Foo> $genericTraitString
+	 * @param enum-string<Bar> $genericEnumString
+	 * @param enum-string<BuzInterface> $genericInterfaceEnumString
+	 */
+	public function doFoo(
+		string $interfaceString,
+		string $traitString,
+		string $genericInterfaceString,
+		string $genericTraitString,
+		string $genericEnumString,
+		string $genericInterfaceEnumString,
+	): void
+	{
+		assertType('class-string', $interfaceString);
+		assertType('class-string', $traitString);
+		assertType('class-string<MoreTypeStringsPhp8\Foo>', $genericInterfaceString);
+		assertType('string', $genericTraitString);
+		assertType('class-string<MoreTypeStringsPhp8\Bar>', $genericEnumString);
+		assertType('class-string<MoreTypeStringsPhp8\BuzInterface&UnitEnum>', $genericInterfaceEnumString);
+	}
+
+}
+
+enum Bar
+{
+
+	case A;
+	case B;
+
+}
+
+interface BuzInterface
+{
+
+}
diff --git a/tests/PHPStan/Analyser/nsrt/more-types.php b/tests/PHPStan/Analyser/nsrt/more-types.php
index e98bc06a76..c8ae927b2d 100644
--- a/tests/PHPStan/Analyser/nsrt/more-types.php
+++ b/tests/PHPStan/Analyser/nsrt/more-types.php
@@ -42,7 +42,7 @@ public function doFoo(
 		assertType('array&callable(): mixed', $callableArray);
 		assertType('resource', $closedResource);
 		assertType('resource', $openResource);
-		assertType('class-string', $enumString);
+		assertType('class-string<UnitEnum>', $enumString);
 		assertType('literal-string&non-empty-string', $nonEmptyLiteralString);
 		assertType('float|int<min, -1>|int<1, max>|non-falsy-string|true', $nonEmptyScalar);
 		assertType("0|0.0|''|'0'|false", $emptyScalar);