diff --git a/src/jniutils.cc b/src/jniutils.cc
index da8c6d4..6a98a70 100644
--- a/src/jniutils.cc
+++ b/src/jniutils.cc
@@ -748,7 +748,7 @@ namespace pEp {
 
         PEP_CIPHER_SUITE to_CipherSuite(JNIEnv *env, jobject obj)
         {
-            static const char *classname = "foundation/pEp/jniadapter/Message$CipherSuite";
+            static const char *classname = "foundation/pEp/jniadapter/CipherSuite";
             jclass clazz_enc_format = findClass(env, classname);
             jfieldID field_value = env->GetFieldID(clazz_enc_format, "value", "I");
             assert(field_value);
diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
index 156aac0..34199d9 100644
--- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
@@ -158,7 +158,6 @@ class TestMain {
             ctx.engine.disable_identity_for_sync(ctx.alice);
         }).run();
 
-        // TODO: class not found: foundation/pEp/jniadapter/Message$CipherSuite
         new TestUnit<RegTestContext>("Engine.config_cipher_suite", new RegTestContext(), ctx -> {
             ctx.engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault);
         }).run();