diff --git a/Makefile b/Makefile
index fa5c106..354cf02 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,10 @@ cap:
 17:
 	JAVA_HOME=$(JAVA17) ant test
 
+21:
+	JAVA_HOME=$(JAVA21) ant test
 
-all: cap 8 11 17
+all: cap 8 11 17 21
 
 clean:
 	rm -f *~ *.cap
diff --git a/kits.xml b/kits.xml
index a45d52d..0d8d06c 100644
--- a/kits.xml
+++ b/kits.xml
@@ -12,5 +12,5 @@
     <property name="JC305_3" value="sdks/jc305u3_kit"/>
     <property name="JC305" value="sdks/jc305u4_kit"/>
     <property name="JC310" value="sdks/jc310r20210706_kit"/>
-    <property name="JC320" value="sdks/jc320v24.0_kit"/>
+    <property name="JC320" value="sdks/jc320v24.1_kit"/>
 </project>    
\ No newline at end of file
diff --git a/sdks b/sdks
index 6025a1d..e2df471 160000
--- a/sdks
+++ b/sdks
@@ -1 +1 @@
-Subproject commit 6025a1d48060b2a72df2d862de310be434f42272
+Subproject commit e2df471e04d86f33de69a947f44766fbef1d9d69
diff --git a/tests-1.8.xml b/tests-1.8.xml
index ecd157f..d6cc69e 100644
--- a/tests-1.8.xml
+++ b/tests-1.8.xml
@@ -6,10 +6,6 @@
     <!-- Different SDK-s-->
     <target name="test-sdks">
         <javacard>
-            <!-- JC 3.2.0 -->
-            <cap jckit="${JC320}" sources="src/testapplets/empty">
-                <applet class="testapplets.empty.Empty" aid="0102030405060708"/>
-            </cap>
             <!-- JC 3.1.0 -->
             <cap jckit="${JC310}" sources="src/testapplets/empty">
                 <applet class="testapplets.empty.Empty" aid="0102030405060708"/>
@@ -68,7 +64,7 @@
     </target>
     <!-- Library -->
     <target name="test-library" depends="jcpro,test-library-old">
-        <javacard jckit="${JC320}">
+        <javacard jckit="${JC310}">
             <cap targetsdk="3.0.4" sources="src/testapplets/library" package="testapplets.library" aid="01020304050607" export="testlib" version="0.127"/>
         </javacard>
     </target>