diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6204a9e11..7e8a2ee31 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [8, 11, 17, 21]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v1
diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml
index ac671f169..68b8de654 100644
--- a/google-oauth-client-java6/pom.xml
+++ b/google-oauth-client-java6/pom.xml
@@ -66,7 +66,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>com.google.oauth-client-java6</Bundle-SymbolicName>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
           </instructions>
         </configuration>
         <executions>
diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml
index 12ca9e04b..e7535ee4c 100644
--- a/google-oauth-client-servlet/pom.xml
+++ b/google-oauth-client-servlet/pom.xml
@@ -92,7 +92,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>com.google.oauth-client-servlet</Bundle-SymbolicName>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
           </instructions>
         </configuration>
         <executions>
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index bbcc4ea11..b84eefe56 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -59,7 +59,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>com.google.oauth-client</Bundle-SymbolicName>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
           </instructions>
         </configuration>
         <executions>