diff --git a/.github/workflows/build_linux_java.yml b/.github/workflows/build_linux_java.yml
index 2bbdc110c..26a9c24d6 100644
--- a/.github/workflows/build_linux_java.yml
+++ b/.github/workflows/build_linux_java.yml
@@ -69,10 +69,10 @@ jobs:
     - name: Run Zserio tests with extra arguments
       run: |
         export ZSERIO_EXTRA_ARGS="-withTypeInfoCode -withCodeComments"
-        scripts/test.sh -p -i arguments/without_writer_code java
+        scripts/test.sh -p -i arguments/without_writer_code -i language/builtin_types java
 
         export ZSERIO_EXTRA_ARGS="${ZSERIO_EXTRA_ARGS} -withValidationCode -withRangeCheckCode"
-        scripts/test.sh -p -x arguments/without_writer_code java
+        scripts/test.sh -p -x arguments/without_writer_code -x language/builtin_types java
 
     - name: Run Zserio integration tests for repeated generation
       run: |
diff --git a/.github/workflows/build_windows_java.yml b/.github/workflows/build_windows_java.yml
index 0c692bb94..998d767c8 100644
--- a/.github/workflows/build_windows_java.yml
+++ b/.github/workflows/build_windows_java.yml
@@ -37,7 +37,7 @@ jobs:
 
     - name: Install clang format
       shell: bash
-      run: | 
+      run: |
         choco install llvm --version=14.0.0 --allow-downgrade
 
     - name: Install specific version of Java static code analysis tool (spotbugs)
@@ -79,14 +79,15 @@ jobs:
       run: |
         scripts/test.sh java
 
+    # DynamicBitFieldLengthBoundsTest fails with range checking - see https://github.com/ndsev/zserio/issues/79
     - name: Run Zserio tests with extra arguments
       shell: bash
       run: |
         export ZSERIO_EXTRA_ARGS="-withTypeInfoCode -withCodeComments"
-        scripts/test.sh -p -i arguments/without_writer_code java
+        scripts/test.sh -p -i arguments/without_writer_code -i language/builtin_types java
 
         export ZSERIO_EXTRA_ARGS="${ZSERIO_EXTRA_ARGS} -withValidationCode -withRangeCheckCode"
-        scripts/test.sh -p -x arguments/without_writer_code java
+        scripts/test.sh -p -x arguments/without_writer_code -x language/builtin_types java
 
     - name: Run Zserio integration tests for repeated generation
       shell: bash