diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index f930d484..d304652e 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:bc2bf47c7370f1b1a8a46b0c104ce7e43644ac58902c9de265fe1f253fcc2506
-# created: 2023-10-31T13:44:21.909247346Z
+  digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88
+# created: 2023-12-01T19:50:20.444857406Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e27b2c57..ae66b197 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v3
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index a3cede3e..73ab82e6 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -49,7 +49,8 @@ case ${JOB_TYPE} in
 test)
     echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
     retry_with_backoff 3 10 \
-      mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
+    # adding -Dnet.bytebuddy.experimental=true to enable Java 21 testing 
+      mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} -Dnet.bytebuddy.experimental=true 
     RETURN_CODE=$?
     ;;
 lint)