diff --git a/src/Composer/Autoload/ClassMapGenerator.php b/src/Composer/Autoload/ClassMapGenerator.php
index 92295f021..ec8c3de5b 100644
--- a/src/Composer/Autoload/ClassMapGenerator.php
+++ b/src/Composer/Autoload/ClassMapGenerator.php
@@ -215,7 +215,7 @@ class ClassMapGenerator
     private static function findClasses($path)
     {
         $extraTypes = PHP_VERSION_ID < 50400 ? '' : '|trait';
-        if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
+        if (PHP_VERSION_ID >= 80100 || (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>='))) {
             $extraTypes .= '|enum';
         }
 
diff --git a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
index 00ca13712..1fb73c253 100644
--- a/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/ClassMapGeneratorTest.php
@@ -96,6 +96,16 @@ class ClassMapGeneratorTest extends TestCase
                 'Dummy\Test\AnonClassHolder' => __DIR__ . '/Fixtures/php7.0/anonclass.php',
             ));
         }
+
+        if (PHP_VERSION_ID >= 80100) {
+            $data[] = array(__DIR__ . '/Fixtures/php8.1', array(
+                'RolesBasicEnum' => __DIR__ . '/Fixtures/php8.1/enum_basic.php',
+                'RolesBackedEnum' => __DIR__ . '/Fixtures/php8.1/enum_backed.php',
+                'RolesClassLikeEnum' => __DIR__ . '/Fixtures/php8.1/enum_class_semantics.php',
+                'Foo\Bar\RolesClassLikeNamespacedEnum' => __DIR__ . '/Fixtures/php8.1/enum_namespaced.php',
+            ));
+        }
+
         if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.3', '>=')) {
             $data[] = array(__DIR__ . '/Fixtures/hhvm3.3', array(
                 'FooEnum' => __DIR__ . '/Fixtures/hhvm3.3/HackEnum.php',
diff --git a/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_backed.php b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_backed.php
new file mode 100644
index 000000000..d8963e056
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_backed.php
@@ -0,0 +1,7 @@
+<?php
+
+enum RolesBackedEnum: string {
+    case Admin = 'Administrator';
+    case Guest = 'Guest';
+    case Moderator = 'Moderator';
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_basic.php b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_basic.php
new file mode 100644
index 000000000..fd352eb22
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_basic.php
@@ -0,0 +1,7 @@
+<?php
+
+enum RolesBasicEnum {
+    case ADMIN;
+    case Guest;
+    case Moderator;
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_class_semantics.php b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_class_semantics.php
new file mode 100644
index 000000000..f11cf0177
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_class_semantics.php
@@ -0,0 +1,7 @@
+<?php
+
+enum RolesClassLikeEnum: string implements TestFoo {
+    case Admin = 'Administrator';
+    case Guest = 'Guest';
+    case Moderator = 'Moderator';
+}
diff --git a/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_namespaced.php b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_namespaced.php
new file mode 100644
index 000000000..874433cea
--- /dev/null
+++ b/tests/Composer/Test/Autoload/Fixtures/php8.1/enum_namespaced.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Foo\Bar;
+
+enum RolesClassLikeNamespacedEnum: string implements TestFoo {
+    case Admin = 'Administrator';
+    case Guest = 'Guest';
+    case Moderator = 'Moderator';
+}