diff --git a/jemoji-languages/build.gradle.kts b/jemoji-languages/build.gradle.kts
index ebddb62..be422c6 100644
--- a/jemoji-languages/build.gradle.kts
+++ b/jemoji-languages/build.gradle.kts
@@ -48,8 +48,6 @@ repositories {
 
 dependencies {
     compileOnly(project(":jemoji"))
-    //testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    //testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation(project(":jemoji"))
 }
 
@@ -70,7 +68,7 @@ testing {
         // Configure the built-in test suite
         val test by getting(JvmTestSuite::class) {
             // Use JUnit4 test framework
-            useJUnit("4.13.2")
+            useJUnitJupiter("5.11.3")
         }
     }
 }
diff --git a/jemoji-languages/src/test/java/jemoji/EmojiManagerTest.java b/jemoji-languages/src/test/java/net/fellbaum/jemoji/languages/EmojiManagerTest.java
similarity index 69%
rename from jemoji-languages/src/test/java/jemoji/EmojiManagerTest.java
rename to jemoji-languages/src/test/java/net/fellbaum/jemoji/languages/EmojiManagerTest.java
index 579eb36..29002c4 100644
--- a/jemoji-languages/src/test/java/jemoji/EmojiManagerTest.java
+++ b/jemoji-languages/src/test/java/net/fellbaum/jemoji/languages/EmojiManagerTest.java
@@ -1,10 +1,10 @@
-package jemoji;
+package net.fellbaum.jemoji.languages;
 
 import net.fellbaum.jemoji.EmojiLanguage;
 import net.fellbaum.jemoji.Emojis;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EmojiManagerTest {
 
diff --git a/jemoji/build.gradle.kts b/jemoji/build.gradle.kts
index 6529314..7a6786c 100644
--- a/jemoji/build.gradle.kts
+++ b/jemoji/build.gradle.kts
@@ -61,7 +61,7 @@ testing {
         // Configure the built-in test suite
         val test by getting(JvmTestSuite::class) {
             // Use JUnit4 test framework
-            useJUnit("4.13.2")
+            useJUnitJupiter("5.11.3")
         }
     }
 }
diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java
index d3658a7..5f65ca7 100644
--- a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java
+++ b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiManagerTest.java
@@ -1,6 +1,6 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class EmojiManagerTest {
 
diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java
index 02868cc..d5a617f 100644
--- a/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java
+++ b/jemoji/src/test/java/net/fellbaum/jemoji/EmojiTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EmojiTest {
 
diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java
index c179161..dc6d905 100644
--- a/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java
+++ b/jemoji/src/test/java/net/fellbaum/jemoji/FitzpatrickTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FitzpatrickTest {
 
diff --git a/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java b/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java
index 9591e9f..7463750 100644
--- a/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java
+++ b/jemoji/src/test/java/net/fellbaum/jemoji/HairStyleTest.java
@@ -1,8 +1,8 @@
 package net.fellbaum.jemoji;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class HairStyleTest {