diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
index a1b60def3..92e8ab75f 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/native.yml
@@ -17,8 +17,6 @@ jobs:
           - docker.io/arangodb/enterprise:3.11.6
         topology:
           - single
-        java-version:
-          - 17
         module:
           - driver
           - integration-tests
@@ -27,10 +25,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: 'latest'
-          java-version: ${{matrix.java-version}}
+          java-version: '21.0.1'
+          distribution: 'graalvm'
+          cache: 'maven'
+          native-image-job-reports: 'true'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'native-image,js'
       - name: Start Database
         run: ./docker/start_db.sh
         env:
@@ -56,8 +55,6 @@ jobs:
           - docker.io/arangodb/enterprise:3.11.6
         topology:
           - single
-        java-version:
-          - 17
         module:
           - driver
           - integration-tests
@@ -66,10 +63,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: 'latest'
-          java-version: ${{matrix.java-version}}
+          java-version: '21.0.1'
+          distribution: 'graalvm'
+          cache: 'maven'
+          native-image-job-reports: 'true'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'native-image,js'
       - name: Start Database
         run: ./docker/start_db.sh
         env:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d1e8fe0fc..72ac706ad 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -106,10 +106,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: graalvm/setup-graalvm@v1
         with:
-          version: 'latest'
-          java-version: '17'
+          java-version: '21.0.1'
+          distribution: 'graalvm'
+          cache: 'maven'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: 'js'
       - name: Info
         run: mvn -version
       - name: Test
diff --git a/driver/pom.xml b/driver/pom.xml
index 6a72445fb..2b528ab2e 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -22,26 +22,6 @@
     </properties>
 
     <profiles>
-        <profile>
-            <id>no-graalvm</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.11.0</version>
-                        <configuration>
-                            <testExcludes>
-                                <exclude>graalvm/UnicodeUtilsTest.java</exclude>
-                            </testExcludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>static-code-analysis</id>
             <build>
@@ -189,6 +169,25 @@
             <version>${graalvm.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.graalvm.js</groupId>
+            <artifactId>js-language</artifactId>
+            <version>${graalvm.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>polyglot</artifactId>
+            <version>${graalvm.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.graalvm.polyglot</groupId>
+            <artifactId>js</artifactId>
+            <version>${graalvm.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-core</artifactId>
diff --git a/driver/src/test/java/helper/NativeImageHelper.java b/driver/src/test/java/helper/NativeImageHelper.java
index 0b3b51c64..670633aa8 100644
--- a/driver/src/test/java/helper/NativeImageHelper.java
+++ b/driver/src/test/java/helper/NativeImageHelper.java
@@ -15,7 +15,6 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/driver/src/test/java/unicode/UnicodeUtilsTest.java b/driver/src/test/java/unicode/UnicodeUtilsTest.java
index e0b5d6681..cbdc9bfd7 100644
--- a/driver/src/test/java/unicode/UnicodeUtilsTest.java
+++ b/driver/src/test/java/unicode/UnicodeUtilsTest.java
@@ -4,7 +4,6 @@
 import com.arangodb.util.TestUtils;
 import com.arangodb.util.UnicodeUtils;
 import org.graalvm.home.Version;
-import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Value;
 import org.junit.jupiter.api.AfterAll;
@@ -12,7 +11,6 @@
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 
@@ -26,7 +24,6 @@ class UnicodeUtilsTest {
 
     @BeforeAll
     static void beforeClass() {
-        assumeFalse(ImageInfo.inImageCode(), "skipped in native mode");
         assumeTrue(Version.getCurrent().isRelease(), "This test requires GraalVM");
         context = Context.create();
         jsEncoder = context.eval("js", encodeFn);
diff --git a/shaded/pom.xml b/shaded/pom.xml
index 251dd8616..19b13818e 100644
--- a/shaded/pom.xml
+++ b/shaded/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-            <version>22.3.3</version>
+            <version>${graalvm.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>