diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java b/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
index 478d2a551c..8bf02dfb13 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java b/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
index 1921b37bb1..b199c5ec05 100644
--- a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
+++ b/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
@@ -60,7 +60,7 @@ public class TestHemfPicture {
 
 /*
     @Test
-    @Ignore("Only for manual tests")
+    @Disabled("Only for manual tests")
     public void paintSingle() throws Exception {
         File fileIn = new File("tmp/emfs/govdocs1/844/844795.ppt_2.emf");
 
@@ -82,7 +82,7 @@ public class TestHemfPicture {
 
 /*
     @Test
-    @Ignore("Only for manual tests - need to add org.tukaani:xz:1.8 for this to work")
+    @Disabled("Only for manual tests - need to add org.tukaani:xz:1.8 for this to work")
     public void paintMultiple() throws Exception {
         Pattern fileExt = Pattern.compile("(?i)^(.+/)*(.+)\\.(emf|wmf)$");
         final byte[] buf = new byte[50_000_000];
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
index b7f9369925..ca4ee45071 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
@@ -51,7 +51,7 @@ import org.junit.jupiter.api.Test;
 public class TestFontRendering {
     private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
-    // @Ignore2("This fails on some systems because fonts are rendered slightly different")
+    // @Disabled2("This fails on some systems because fonts are rendered slightly different")
     @Test
     public void bug55902mixedFontWithChineseCharacters() throws IOException, FontFormatException {
         // font files need to be downloaded first via
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
index 6130b1566d..3e84c6db6d 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
+++ b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
@@ -64,7 +64,7 @@ public class TestBiffViewer extends BaseTestIteratingXLS {
     }
 
 //    @Test
-//    @Ignore("only used for manual tests")
+//    @Disabled("only used for manual tests")
 //    @SuppressWarnings("java:S2699")
 //    public void testOneFile() throws Exception {
 //        POIDataSamples samples = POIDataSamples.getSpreadSheetInstance();
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 8b4ecf8eb9..1fb3de3712 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
@@ -297,7 +297,7 @@ public abstract class BaseTestSheetShiftRows {
         wb.close();
     }
 
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
+    //@Disabled("bug 56454: Incorrectly handles merged regions that do not contain column 0")
     @Test
     public final void shiftWithMergedRegions_bug56454() throws IOException {
         Workbook wb = _testDataProvider.createWorkbook();
@@ -597,7 +597,7 @@ public abstract class BaseTestSheetShiftRows {
         read.close();
     }
 
-    //@Ignore("bug 56454: Incorrectly handles merged regions that do not contain column 0")
+    //@Disabled("bug 56454: Incorrectly handles merged regions that do not contain column 0")
     @Test
     public void shiftRowsWithMergedRegionsThatDoNotContainColumnZero() throws IOException {
         Workbook wb = _testDataProvider.createWorkbook();