diff --git a/CryptoAnalysis/pom.xml b/CryptoAnalysis/pom.xml
index 404490e22..033eeff83 100644
--- a/CryptoAnalysis/pom.xml
+++ b/CryptoAnalysis/pom.xml
@@ -146,6 +146,12 @@
             <version>${opal.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>de.opal-project</groupId>
+            <artifactId>static-analysis-infrastructure_2.13</artifactId>
+            <version>${opal.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Other dependencies -->
         <dependency>
diff --git a/CryptoAnalysis/src/test/java/test/framework/OpalTestSetup.java b/CryptoAnalysis/src/test/java/test/framework/OpalTestSetup.java
index 300ce5c5f..21dc01f7c 100644
--- a/CryptoAnalysis/src/test/java/test/framework/OpalTestSetup.java
+++ b/CryptoAnalysis/src/test/java/test/framework/OpalTestSetup.java
@@ -27,8 +27,8 @@
 import java.util.Set;
 import java.util.stream.Stream;
 import org.opalj.br.ClassFile;
+import org.opalj.br.ClassType;
 import org.opalj.br.MethodDescriptor$;
-import org.opalj.br.ObjectType;
 import org.opalj.br.analyses.Project;
 import org.opalj.br.analyses.Project$;
 import org.opalj.br.analyses.cg.InitialEntryPointsKey;
@@ -59,7 +59,7 @@ public void initialize(String classPath, String className, String testName) {
 
         // Load the class that contains the test method
         Option<ClassFile> testClass =
-                project.classFile(ObjectType.apply(className.replace(".", "/")));
+                project.classFile(ClassType.apply(className.replace(".", "/")));
         if (testClass.isEmpty()) {
             throw new RuntimeException("Could not find class " + className);
         }
diff --git a/HeadlessJavaScanner/pom.xml b/HeadlessJavaScanner/pom.xml
index 8d9b585ae..f15a4b3fc 100644
--- a/HeadlessJavaScanner/pom.xml
+++ b/HeadlessJavaScanner/pom.xml
@@ -115,6 +115,11 @@
             <artifactId>three-address-code_2.13</artifactId>
             <version>${opal.version}</version>
         </dependency>
+        <dependency>
+            <groupId>de.opal-project</groupId>
+            <artifactId>static-analysis-infrastructure_2.13</artifactId>
+            <version>${opal.version}</version>
+        </dependency>
 
         <!-- Other dependencies -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index c4773c4d4..779525122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <spds.version>4.3.2</spds.version>
         <soot.version>4.6.0</soot.version>
         <sootup.version>2.0.0</sootup.version>
-        <opal.version>5.0.0</opal.version>
+        <opal.version>6.0.0</opal.version>
         <crysl.version>4.0.5</crysl.version>
         <junit.version>6.0.0</junit.version>
         <guava.version>33.5.0-jre</guava.version>