diff --git a/server/src/main/java/com/linecorp/centraldogma/server/internal/api/auth/ApplicationCertificateAuthorizer.java b/server/src/main/java/com/linecorp/centraldogma/server/internal/api/auth/ApplicationCertificateAuthorizer.java
index 151fb0cc7..aa1091833 100644
--- a/server/src/main/java/com/linecorp/centraldogma/server/internal/api/auth/ApplicationCertificateAuthorizer.java
+++ b/server/src/main/java/com/linecorp/centraldogma/server/internal/api/auth/ApplicationCertificateAuthorizer.java
@@ -111,13 +111,10 @@ public CompletionStage<Boolean> authorize(ServiceRequestContext ctx, HttpRequest
                 continue;
             }
             final X509Certificate x509Certificate = (X509Certificate) peerCert;
-            /* // Uncomment the following lines after fixing Singned Certificate Extension to
-            generate end-entity certs.
             if (x509Certificate.getBasicConstraints() != -1) {
                 logger.trace("Skipping CA certificate: addr={}, cert={}", ctx.clientAddress(), x509Certificate);
                 continue;
             }
-            */
 
             certificateId = ID_EXTRACTOR.extractCertificateId(x509Certificate);
             if (certificateId != null) {
diff --git a/server/src/test/java/com/linecorp/centraldogma/server/internal/admin/auth/CertificateAppIdentityAuthTest.java b/server/src/test/java/com/linecorp/centraldogma/server/internal/admin/auth/CertificateAppIdentityAuthTest.java
index 801bc55cb..1410a7315 100644
--- a/server/src/test/java/com/linecorp/centraldogma/server/internal/admin/auth/CertificateAppIdentityAuthTest.java
+++ b/server/src/test/java/com/linecorp/centraldogma/server/internal/admin/auth/CertificateAppIdentityAuthTest.java
@@ -69,7 +69,7 @@ final class CertificateAppIdentityAuthTest {
     @Order(3)
     @RegisterExtension
     static final SignedCertificateExtension clientCert =
-            new SignedCertificateExtension("my-client", ca);
+            new SignedCertificateExtension("my-client", ca, false);
 
     @RegisterExtension
     static final CentralDogmaExtension dogma = new CentralDogmaExtension() {
diff --git a/server/src/test/java/com/linecorp/centraldogma/server/metadata/MetadataApiServiceTest.java b/server/src/test/java/com/linecorp/centraldogma/server/metadata/MetadataApiServiceTest.java
index dbd367093..423585ee6 100644
--- a/server/src/test/java/com/linecorp/centraldogma/server/metadata/MetadataApiServiceTest.java
+++ b/server/src/test/java/com/linecorp/centraldogma/server/metadata/MetadataApiServiceTest.java
@@ -88,7 +88,7 @@ class MetadataApiServiceTest {
     @Order(3)
     @RegisterExtension
     static final SignedCertificateExtension clientCert =
-            new SignedCertificateExtension("my-client", ca);
+            new SignedCertificateExtension("my-client", ca, false);
 
     @RegisterExtension
     static CentralDogmaExtension dogma = new CentralDogmaExtension() {