diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java
index 686a6d4d7..55859cf7a 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/BaseTestForSmile.java
@@ -1,21 +1,17 @@
 package com.fasterxml.jackson.dataformat.smile;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.util.Arrays;
 
-import org.junit.Assert;
-
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.ContentReference;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.util.BufferRecycler;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public abstract class BaseTestForSmile
-    extends junit.framework.TestCase
 {
     // From JSON specification, sample doc...
     protected final static int SAMPLE_SPEC_VALUE_WIDTH = 800;
@@ -210,7 +206,7 @@ protected void verifyException(Throwable e, String... matches)
 
     protected void _verifyBytes(byte[] actBytes, byte... expBytes)
     {
-        Assert.assertArrayEquals(expBytes, actBytes);
+        assertArrayEquals(expBytes, actBytes);
     }
 
     /**
@@ -229,7 +225,7 @@ protected String getAndVerifyText(JsonParser p) throws IOException
         if (str.length() !=  actLen) {
             fail("Internal problem (p.token == "+p.getCurrentToken()+"): p.getText().length() ['"+str+"'] == "+str.length()+"; p.getTextLength() == "+actLen);
         }
-        assertEquals("String access via getText(), getTextXxx() must be the same", str, str2);
+        assertEquals(str, str2, "String access via getText(), getTextXxx() must be the same");
 
         return str;
     }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FloatPrecisionTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FloatPrecisionTest.java
index 769d10f6b..d50d8f96b 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FloatPrecisionTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FloatPrecisionTest.java
@@ -1,13 +1,17 @@
 package com.fasterxml.jackson.dataformat.smile;
+
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 
-import static org.junit.Assert.assertArrayEquals;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 // for [jackson-core#730]
 public class FloatPrecisionTest extends BaseTestForSmile
 {
     // for [jackson-core#730]
+    @Test
     public void testFloatRoundtrips() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FormatDefaultsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FormatDefaultsTest.java
index d58c9e9f9..76af1f540 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FormatDefaultsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/FormatDefaultsTest.java
@@ -1,13 +1,18 @@
 package com.fasterxml.jackson.dataformat.smile;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.StreamReadCapability;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class FormatDefaultsTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testParserDefaults() throws Exception
     {
         try (JsonParser p = MAPPER.createParser(new byte[4])) {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/ParserInternalsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/ParserInternalsTest.java
index 6b4670d6b..2adfd16a8 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/ParserInternalsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/ParserInternalsTest.java
@@ -2,14 +2,20 @@
 
 import java.io.InputStream;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
 import com.fasterxml.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class ParserInternalsTest extends BaseTestForSmile
 {
     private final ByteQuadsCanonicalizer ROOT_SYMBOLS = ByteQuadsCanonicalizer.createRoot();
 
+    @Test
     public void testPositiveVIntGoodCases() throws Exception
     {
         // First, couple of known good cases
@@ -20,6 +26,7 @@ public void testPositiveVIntGoodCases() throws Exception
         });
     }
 
+    @Test
     public void testPositiveVIntOverflows() throws Exception
     {
         // Bad: ends at 5th, but overflows
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileFactoryPropertiesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileFactoryPropertiesTest.java
index 5c614c226..8841a56f6 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileFactoryPropertiesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileFactoryPropertiesTest.java
@@ -2,20 +2,20 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.dataformat.smile.async.NonBlockingByteArrayParser;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
-/**
- * Miscellaneous tests for {@link SmileFactory}, and for some aspects
- * of generators and parsers it creates.
- */
 public class SmileFactoryPropertiesTest extends BaseTestForSmile
 {
     private final static String SIMPLE_DOC_AS_JSON = "{\"simple\":[1,true,{}]}";
 
     private final static SmileFactory SMILE_F = new SmileFactory();
+
+    @Test
     public void testFactoryDefaults() {
         SmileFactory f = new SmileFactory();
 
@@ -30,6 +30,7 @@ public void testFactoryDefaults() {
                 f.isEnabled(SmileGenerator.Feature.CHECK_SHARED_STRING_VALUES));
     }
 
+    @Test
     public void testFactorySerializable() throws Exception
     {
         SmileFactory f = new SmileFactory();
@@ -44,6 +45,7 @@ public void testFactorySerializable() throws Exception
         assertArrayEquals(doc, docOut);
     }
 
+    @Test
     public void testFactoryCopy() throws Exception
     {
         SmileFactory f2 = SMILE_F.copy();
@@ -53,6 +55,7 @@ public void testFactoryCopy() throws Exception
         assertNotNull(doc);
     }
 
+    @Test
     public void testVersions() throws Exception
     {
         SmileFactory f = SMILE_F;
@@ -69,6 +72,7 @@ public void testVersions() throws Exception
         p.close();
     }
 
+    @Test
     public void testCapabilities() throws Exception
     {
         assertTrue(SMILE_F.canHandleBinaryNatively());
@@ -77,6 +81,7 @@ public void testCapabilities() throws Exception
         assertEquals(SmileGenerator.Feature.class, SMILE_F.getFormatWriteFeatureType());
     }
 
+    @Test
     public void testInabilityToReadChars() throws Exception
     {
         final String EXP = "for character-based";
@@ -100,6 +105,7 @@ public void testInabilityToReadChars() throws Exception
         }
     }
 
+    @Test
     public void testInabilityToWriteChars() throws Exception
     {
         try {
@@ -112,6 +118,7 @@ public void testInabilityToWriteChars() throws Exception
     }
 
     // One lesser known feature is the ability to fall back to using JSON...
+    @Test
     public void testFallbackReadFromJson() throws Exception
     {
         SmileFactory f = new SmileFactory();
@@ -122,6 +129,7 @@ public void testFallbackReadFromJson() throws Exception
     }
 
     // One lesser known feature is the ability to fall back to using JSON...
+    @Test
     public void testFallbackWriteAsJson() throws Exception
     {
         SmileFactory f = new SmileFactory();
@@ -135,6 +143,7 @@ public void testFallbackWriteAsJson() throws Exception
         assertEquals("[]", w.toString());
     }
 
+    @Test
     public void testCanonicalization() throws Exception
     {
         try (NonBlockingByteArrayParser parser = new SmileFactory()
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileUtilTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileUtilTest.java
index 7a576cc65..a12b7f737 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileUtilTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SmileUtilTest.java
@@ -1,10 +1,15 @@
 package com.fasterxml.jackson.dataformat.smile;
 
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class SmileUtilTest extends BaseTestForSmile
 {
     /**
      * Verification of helper methods used to handle with zigzag encoding
      */
+    @Test
     public void testZigZagInt()
     {
         // simple encode
@@ -26,6 +31,7 @@ public void testZigZagInt()
         assertEquals(Integer.MAX_VALUE, SmileUtil.zigzagDecode(SmileUtil.zigzagEncode(Integer.MAX_VALUE)));
     }
 
+    @Test
     public void testZigZagLong()
     {
         assertEquals(0L, SmileUtil.zigzagEncode(0L));
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SymbolHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SymbolHandlingTest.java
index b48d15ef9..8ee51a40f 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SymbolHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/SymbolHandlingTest.java
@@ -2,12 +2,16 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
 
-// Tests that have to reside in this package, due to access restrictions
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SymbolHandlingTest extends BaseTestForSmile
 {
+    @Test
     public void testSymbolTable() throws IOException
     {
         final String STR1 = "a";
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/VersionsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/VersionsTest.java
index 67f44350d..69b4f37b6 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/VersionsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/VersionsTest.java
@@ -1,14 +1,17 @@
 package com.fasterxml.jackson.dataformat.smile;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.Versioned;
 
-/**
- * Tests to verify [JACKSON-278]
- */
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class VersionsTest extends BaseTestForSmile
 {
+    @Test
     public void testMapperVersions() throws IOException
     {
         SmileFactory f = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncParserNamesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncParserNamesTest.java
index 200b17a8e..f751e489c 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncParserNamesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncParserNamesTest.java
@@ -1,19 +1,25 @@
 package com.fasterxml.jackson.dataformat.smile.async;
 
-import java.io.*;
+import java.io.IOException;
 import java.util.Random;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class AsyncParserNamesTest extends AsyncTestBase
 {
+    @Test
     public void testLongNames() throws IOException
     {
         _testWithName(generateName(5000));
     }
 
+    @Test
     public void testEvenLongerName() throws Exception
     {
         StringBuilder nameBuf = new StringBuilder("longString");
@@ -25,6 +31,7 @@ public void testEvenLongerName() throws Exception
         _testWithName(name);
     }
 
+    @Test
     public void testSymbolTable() throws IOException
     {
         final String STR1 = "a";
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncSharedStringsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncSharedStringsTest.java
index 63194e1a1..049a1cec1 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncSharedStringsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncSharedStringsTest.java
@@ -1,13 +1,18 @@
 package com.fasterxml.jackson.dataformat.smile.async;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Unit tests for verifying that symbol handling works as planned, including
  * efficient reuse of names encountered during parsing.
@@ -71,6 +76,7 @@ static class Content
     /**********************************************************
      */
 
+    @Test
     public void testSharedNames() throws IOException
     {
         final int COUNT = 19000;
@@ -112,6 +118,7 @@ public void testSharedNames() throws IOException
         p.close();
     }
 
+    @Test
     public void testSharedStrings() throws IOException
     {
         final int count = 19000;
@@ -127,6 +134,7 @@ public void testSharedStrings() throws IOException
         verifyStringValues(shared, count);
     }
 
+    @Test
     public void testSharedStringsInArrays() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -153,6 +161,7 @@ public void testSharedStringsInArrays() throws IOException
         p.close();
     }
 
+    @Test
     public void testSharedStringsInObject() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -181,6 +190,7 @@ public void testSharedStringsInObject() throws IOException
         p.close();
     }
 
+    @Test
     public void testSharedStringsMixed() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -302,6 +312,7 @@ public void testSharedStringsMixed() throws IOException
         p.close();
     }
 
+    @Test
     public void testDataBindingAndShared() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -338,6 +349,7 @@ public void testDataBindingAndShared() throws IOException
     /**
      * Reproducing [JACKSON-561] (and [JACKSON-562])
      */
+    @Test
     public void testIssue562() throws IOException
     {
         JsonFactory factory = new SmileFactory();
@@ -372,6 +384,7 @@ public void testIssue562() throws IOException
     /**
      * Verification that [JACKSON-564] was fixed.
      */
+    @Test
     public void testIssue564() throws Exception
     {
         JsonFactory factory = new SmileFactory();
@@ -450,6 +463,7 @@ public void testIssue564() throws Exception
         parser.close();
     }
 
+    @Test
     public void testCorruptName34() throws Exception
     {
         SmileFactory factory = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncTestBase.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncTestBase.java
index e991a3c66..a89414165 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncTestBase.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/AsyncTestBase.java
@@ -3,8 +3,8 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonToken;
-
-import com.fasterxml.jackson.dataformat.smile.*;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
 abstract class AsyncTestBase extends BaseTestForSmile
 {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConcurrentAsyncTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConcurrentAsyncTest.java
index e7dd448c3..ab03c6b3f 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConcurrentAsyncTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConcurrentAsyncTest.java
@@ -2,20 +2,21 @@
 
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.ByteArrayFeeder;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
-// for [dataformats-binary#384]
 public class ConcurrentAsyncTest extends AsyncTestBase
 {
+    @Test
     public void testConcurrentHandling() throws Exception
     {
         Map<String, Map<String, String>> tags = new HashMap<>();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConfigTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConfigTest.java
index 657c77856..9ab54c6b7 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConfigTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/ConfigTest.java
@@ -2,19 +2,25 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ConfigTest extends AsyncTestBase
 {
     private final SmileFactory DEFAULT_F = new SmileFactory();
 
+    @Test
     public void testFactoryDefaults() throws IOException
     {
         assertTrue(DEFAULT_F.canParseAsync());
     }
 
+    @Test
     public void testAsyncParerDefaults() throws IOException
     {
         byte[] data = _smileDoc("[ true, false ]", true);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/RootValuesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/RootValuesTest.java
index bdea65027..211adb6ae 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/RootValuesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/RootValuesTest.java
@@ -3,8 +3,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.smile.*;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileParser;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class RootValuesTest extends AsyncTestBase
 {
@@ -13,6 +18,7 @@ public class RootValuesTest extends AsyncTestBase
         F_REQ_HEADERS.enable(SmileParser.Feature.REQUIRE_HEADER);
     }
 
+    @Test
     public void testSimpleRootSequence() throws Exception
     {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream(100);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleBinaryParseTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleBinaryParseTest.java
index ce4c48638..663567fd1 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleBinaryParseTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleBinaryParseTest.java
@@ -1,13 +1,16 @@
 package com.fasterxml.jackson.dataformat.smile.async;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SimpleBinaryParseTest extends AsyncTestBase
 {
     private final SmileFactory F_RAW = new SmileFactory(); {
@@ -23,26 +26,32 @@ public class SimpleBinaryParseTest extends AsyncTestBase
         139000
     };
 
+    @Test
     public void testRawAsRootValue() throws IOException {
         _testBinaryAsRoot(F_RAW);
     }
 
+    @Test
     public void testRawAsArray() throws IOException {
         _testBinaryAsArray(F_RAW);
     }
 
+    @Test
     public void testRawAsObject() throws IOException {
         _testBinaryAsObject(F_RAW);
     }
 
+    @Test
     public void test7BitAsArray() throws IOException {
         _testBinaryAsArray(F_7BIT);
     }
 
+    @Test
     public void test7BitAsObject() throws IOException {
         _testBinaryAsObject(F_7BIT);
     }
 
+    @Test
     public void test7BitAsRootValue() throws IOException {
         _testBinaryAsRoot(F_7BIT);
     }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleFailsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleFailsTest.java
index 4ddc40b11..bdc193e3b 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleFailsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleFailsTest.java
@@ -2,10 +2,14 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class SimpleFailsTest extends AsyncTestBase
 {
     private final SmileFactory F_REQ_HEADERS = new SmileFactory();
@@ -19,6 +23,7 @@ public class SimpleFailsTest extends AsyncTestBase
     /**********************************************************************
      */
 
+    @Test
     public void testHeaderFailWithSmile() throws IOException
     {
         byte[] data = _smileDoc("[ true, false ]", false);
@@ -40,6 +45,7 @@ private void _testHeaderFailWithSmile(SmileFactory f,
         }
     }
 
+    @Test
     public void testHeaderFailWithJSON() throws IOException
     {
         byte[] data = "[ true ]".getBytes("UTF-8");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleNestedTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleNestedTest.java
index 8b69031e6..7fb4a3b42 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleNestedTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleNestedTest.java
@@ -2,10 +2,14 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SimpleNestedTest extends AsyncTestBase
 {
     private final SmileFactory F_REQ_HEADERS = new SmileFactory();
@@ -19,6 +23,7 @@ public class SimpleNestedTest extends AsyncTestBase
     /**********************************************************************
      */
 
+    @Test
     public void testStuffInObject() throws Exception
     {
         byte[] data = _smileDoc(aposToQuotes("{'foobar':[1,2,-999],'other':{'':null} }"), true);
@@ -71,6 +76,7 @@ private void _testStuffInObject(SmileFactory f,
         assertNull(r.parser().nextToken());
     }
 
+    @Test
     public void testStuffInArray() throws Exception
     {
         byte[] data = _smileDoc(aposToQuotes("[true,{'extraOrdinary':''},[null],{'extraOrdinary':23}]"), true);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleObjectTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleObjectTest.java
index cedcd56e0..43b7c52ce 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleObjectTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleObjectTest.java
@@ -4,13 +4,15 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SimpleObjectTest extends AsyncTestBase
 {
     private final SmileFactory F_REQ_HEADERS = new SmileFactory();
@@ -38,6 +40,7 @@ static class BooleanBean {
 
     private final static String UNICODE_SHORT_NAME = "Unicode"+UNICODE_3BYTES+"RlzOk";
 
+    @Test
     public void testBooleans() throws IOException
     {
         final SmileFactory f = F_REQ_HEADERS;
@@ -124,6 +127,7 @@ static class  {
     private final double NUMBER_EXP_D = 1024798.125;
     private final BigDecimal NUMBER_EXP_BD = new BigDecimal("1243565768679065.1247305834");
 
+    @Test
     public void testNumbers() throws IOException
     {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream(100);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleScalarArrayTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleScalarArrayTest.java
index 35d13287a..0ba3ab78c 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleScalarArrayTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleScalarArrayTest.java
@@ -5,9 +5,15 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
-import com.fasterxml.jackson.dataformat.smile.*;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import com.fasterxml.jackson.dataformat.smile.SmileParser;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SimpleScalarArrayTest extends AsyncTestBase
 {
@@ -27,6 +33,7 @@ public class SimpleScalarArrayTest extends AsyncTestBase
     /**********************************************************************
      */
 
+    @Test
     public void testBooleans() throws IOException
     {
         byte[] data = _smileDoc("[ true, false, true, true, false ]", true);
@@ -81,6 +88,7 @@ private void _testBooleans(SmileFactory f,
         assertTrue(r.isClosed());
     }
 
+    @Test
     public void testInts() throws IOException
     {
         final int[] input = new int[] { 1, -1, 16, -17, 131, -155, 1000, -3000, 0xFFFF, -99999,
@@ -120,6 +128,7 @@ private void _testInts(SmileFactory f, int[] values,
         assertTrue(r.isClosed());
     }
 
+    @Test
     public void testLong() throws IOException
     {
         final long[] input = new long[] {
@@ -172,6 +181,7 @@ private void _testLong(SmileFactory f, long[] values,
     /**********************************************************************
      */
 
+    @Test
     public void testFloats() throws IOException
     {
         final float[] input = new float[] { 0.0f, 0.25f, -0.5f, 10000.125f, - 99999.075f };
@@ -212,6 +222,7 @@ private void _testFloats(SmileFactory f, float[] values,
         assertTrue(r.isClosed());
     }
 
+    @Test
     public void testDoubles() throws IOException
     {
         final double[] input = new double[] { 0.0, 0.25, -0.5, 10000.125, -99999.075 };
@@ -259,6 +270,7 @@ private void _testDoubles(SmileFactory f, double[] values,
     /**********************************************************************
      */
 
+    @Test
     public void testBigIntegers() throws IOException
     {
         BigInteger bigBase = BigInteger.valueOf(1234567890344656736L);
@@ -320,6 +332,7 @@ private void _testBigIntegers(SmileFactory f, BigInteger[] values,
         assertTrue(r.isClosed());
     }
 
+    @Test
     public void testBigDecimals() throws IOException
     {
         BigDecimal bigBase = new BigDecimal("1234567890344656736.125");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleStringArrayTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleStringArrayTest.java
index 4dbb23d05..70deb81d9 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleStringArrayTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleStringArrayTest.java
@@ -3,13 +3,13 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.StreamReadConstraints;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamConstraintsException;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SimpleStringArrayTest extends AsyncTestBase
 {
@@ -34,6 +34,7 @@ private final static SmileFactory factoryWithShared() {
         return f;
     }
 
+    @Test
     public void testShortAsciiStrings() throws IOException
     {
 
@@ -60,6 +61,7 @@ public void testShortAsciiStrings() throws IOException
         _testStrings(f, input, data, 1, 1);
     }
 
+    @Test
     public void testShortUnicodeStrings() throws IOException
     {
         final String repeat = "Test: "+UNICODE_2BYTES;
@@ -88,6 +90,7 @@ public void testShortUnicodeStrings() throws IOException
         _testStrings(f, input, data, 1, 1);
     }
 
+    @Test
     public void testLongAsciiStrings() throws IOException
     {
         final String[] input = new String[] {
@@ -111,6 +114,7 @@ public void testLongAsciiStrings() throws IOException
         _testStrings(f, input, data, 1, 1);
     }
 
+    @Test
     public void testLongAsciiStringsLowStringLimit() throws IOException
     {
         final String[] input = new String[] {
@@ -137,11 +141,12 @@ public void testLongAsciiStringsLowStringLimit() throws IOException
             r.currentText();
             fail("expected StreamConstraintsException");
         } catch (StreamConstraintsException ise) {
-            assertTrue("unexpected exception message: " + ise.getMessage(),
-                    ise.getMessage().startsWith("String value length (98) exceeds the maximum allowed"));
+            assertTrue(ise.getMessage().startsWith("String value length (98) exceeds the maximum allowed"),
+                    "unexpected exception message: " + ise.getMessage());
         }
     }
 
+    @Test
     public void testLongUnicodeStrings() throws IOException
     {
         // ~100 chars for long(er) content
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/StringObjectTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/StringObjectTest.java
index d9e3dae88..999b18c9f 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/StringObjectTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/StringObjectTest.java
@@ -2,10 +2,12 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class StringObjectTest extends AsyncTestBase
 {
@@ -16,10 +18,12 @@ public class StringObjectTest extends AsyncTestBase
             "Unicode-"+UNICODE_3BYTES+"-%s-%s-%s-"+UNICODE_2BYTES+"-%s-%s-%s-"+UNICODE_3BYTES+"-%s-%s-%s",
             STR0_9, STR0_9, STR0_9, STR0_9, STR0_9, STR0_9, STR0_9, STR0_9, STR0_9);
 
+    @Test
     public void testBasicFieldsNamesSharedNames() throws IOException {
         _testBasicFieldsNames(true);
     }
 
+    @Test
     public void testBasicFieldsNamesNonShared() throws IOException {
         _testBasicFieldsNames(false);
     }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/UnicodeHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/UnicodeHandlingTest.java
index ae6f19421..09640de15 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/UnicodeHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/UnicodeHandlingTest.java
@@ -2,11 +2,17 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class UnicodeHandlingTest extends AsyncTestBase
 {
+    @Test
     public void testShortUnicodeWithSurrogates() throws IOException
     {
         final SmileFactory f = smileFactory(false, true, false);
@@ -24,6 +30,7 @@ public void testShortUnicodeWithSurrogates() throws IOException
         _testUnicodeWithSurrogates(f, 53, 1);
     }
 
+    @Test
     public void testLongUnicodeWithSurrogates() throws IOException
     {
         SmileFactory f = smileFactory(false, true, false);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java
index 9955c0377..1890d1e20 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/DeeplyNestedSmileReadWriteTest.java
@@ -1,18 +1,18 @@
 package com.fasterxml.jackson.dataformat.smile.constraints;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.StreamReadConstraints;
-import com.fasterxml.jackson.core.StreamWriteConstraints;
-import com.fasterxml.jackson.core.exc.StreamConstraintsException;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.exc.StreamConstraintsException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class DeeplyNestedSmileReadWriteTest extends BaseTestForSmile
 {
@@ -28,10 +28,12 @@ public class DeeplyNestedSmileReadWriteTest extends BaseTestForSmile
             .build()
             );
 
+    @Test
     public void testDeepNestingArrayRead() throws Exception {
         _testDeepNestingRead(createDeepNestedArrayDoc(13));
     }
 
+    @Test
     public void testDeepNestingObjectRead() throws Exception {
         _testDeepNestingRead(createDeepNestedObjectDoc(13));
     }
@@ -48,10 +50,12 @@ private void _testDeepNestingRead(JsonNode docRoot) throws Exception
         }
     }
 
+    @Test
     public void testDeepNestingArrayWrite() throws Exception {
         _testDeepNestingWrite(createDeepNestedArrayDoc(13));
     }
 
+    @Test
     public void testDeepNestingObjectWrite() throws Exception {
         _testDeepNestingWrite(createDeepNestedObjectDoc(13));
     }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java
index 7d650545c..b3ba4ddbd 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/constraints/LongDocumentSmileReadTest.java
@@ -4,15 +4,16 @@
 import java.io.ByteArrayOutputStream;
 import java.util.UUID;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.StreamReadConstraints;
-import com.fasterxml.jackson.core.exc.StreamConstraintsException;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.exc.StreamConstraintsException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class LongDocumentSmileReadTest extends BaseTestForSmile
 {
@@ -26,6 +27,7 @@ public class LongDocumentSmileReadTest extends BaseTestForSmile
             .build()
             ).build());
 
+    @Test
     public void testLongDocumentConstraint() throws Exception
     {
         // Need a bit longer than minimum since checking is approximate, not exact
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java
index c211e6b6d..4372365cd 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/filter/StreamingDecoratorsTest.java
@@ -1,14 +1,21 @@
 package com.fasterxml.jackson.dataformat.smile.filter;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.*;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.testutil.PrefixInputDecorator;
 import com.fasterxml.jackson.dataformat.smile.testutil.PrefixOutputDecorator;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class StreamingDecoratorsTest extends BaseTestForSmile
 {
+    @Test
     public void testInputDecorators() throws Exception
     {
         final byte[] DOC = _smileDoc("42   37");
@@ -24,6 +31,7 @@ public void testInputDecorators() throws Exception
         p.close();
     }
 
+    @Test
     public void testOutputDecorators() throws Exception
     {
         final byte[] DOC = _smileDoc(" 137");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java
index 245695400..b54aa45db 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32168BigDecimalTest.java
@@ -2,16 +2,21 @@
 
 import java.math.BigDecimal;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 // For [dataformats-binary#257]
 public class Fuzz32168BigDecimalTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testInvalidBigDecimal() throws Exception
     {
         final byte[] input = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32169HeaderDecodeTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32169HeaderDecodeTest.java
index eafc2dbbd..ae5723aee 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32169HeaderDecodeTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32169HeaderDecodeTest.java
@@ -1,15 +1,20 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 //For [dataformats-binary#258]
 public class Fuzz32169HeaderDecodeTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // Payload:
+    @Test
     public void testInvalidHeader() throws Exception
     {
         final byte[] input = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32180RawBinaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32180RawBinaryTest.java
index a046d9aaa..0e7e4ced0 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32180RawBinaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32180RawBinaryTest.java
@@ -3,9 +3,10 @@
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.io.JsonEOFException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
 // For [dataformats-binary#260]
@@ -13,6 +14,7 @@ public class Fuzz32180RawBinaryTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testInvalidRawBinary() throws Exception
     {
         final byte[] input0 = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32339_7BitBinaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32339_7BitBinaryTest.java
index 4f32f75bf..07fbdcd2a 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32339_7BitBinaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32339_7BitBinaryTest.java
@@ -3,6 +3,8 @@
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
@@ -13,6 +15,7 @@ public class Fuzz32339_7BitBinaryTest extends BaseTestForSmile
     private final ObjectMapper MAPPER = smileMapper();
 
     // Test with negative length indicator (due to overflow) -- CF-32339
+    @Test
     public void testInvalid7BitBinary() throws Exception
     {
         final byte[] input0 = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32527ShortUnicodeTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32527ShortUnicodeTest.java
index 686e04913..96d29eb5d 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32527ShortUnicodeTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32527ShortUnicodeTest.java
@@ -1,16 +1,21 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class Fuzz32527ShortUnicodeTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // [dataformats-binary#266]
+    @Test
     public void testInvalidShortUnicode() throws Exception
     {
         final byte[] input = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32654ShortUnicodeTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32654ShortUnicodeTest.java
index 000c56d52..ebcaa5ce7 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32654ShortUnicodeTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32654ShortUnicodeTest.java
@@ -1,16 +1,21 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class Fuzz32654ShortUnicodeTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // [dataformats-binary#266]
+    @Test
     public void testInvalidShortUnicode() throws Exception
     {
         /*
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32665RepeatedHeaderTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32665RepeatedHeaderTest.java
index a4c64a900..b3ab5ac4a 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32665RepeatedHeaderTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz32665RepeatedHeaderTest.java
@@ -2,17 +2,23 @@
 
 import java.io.ByteArrayOutputStream;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
 // for [dataformats-binary#268]
 public class Fuzz32665RepeatedHeaderTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // for [dataformats-binary#268]
+    @Test
     public void testLongRepeatedHeaders() throws Exception
     {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream(16001);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_265_32377_7BitBinaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_265_32377_7BitBinaryTest.java
index 98c60e376..0da21403c 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_265_32377_7BitBinaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_265_32377_7BitBinaryTest.java
@@ -3,6 +3,8 @@
 import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.io.JsonEOFException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
@@ -13,6 +15,7 @@ public class Fuzz_265_32377_7BitBinaryTest extends BaseTestForSmile
     private final ObjectMapper MAPPER = smileMapper();
 
     // Test with maximum declared payload size -- CF-32377
+    @Test
     public void testInvalid7BitBinary() throws Exception
     {
         final byte[] input0 = new byte[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_291_35932_TruncUTF8NameTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_291_35932_TruncUTF8NameTest.java
index db6d430c8..57211ed89 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_291_35932_TruncUTF8NameTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_291_35932_TruncUTF8NameTest.java
@@ -1,19 +1,22 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.StreamReadException;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 // For https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=35932
 public class Fuzz_291_35932_TruncUTF8NameTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // Test with maximum declared payload size -- CF-32377
+    @Test
     public void testInvalid7BitBinary() throws Exception
     {
         final byte[] input = readResource("/data/clusterfuzz-smile-35932.smile");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_426_65126IOOBETest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_426_65126IOOBETest.java
index f25b23590..a0e31a83b 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_426_65126IOOBETest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/fuzz/Fuzz_426_65126IOOBETest.java
@@ -1,16 +1,22 @@
 package com.fasterxml.jackson.dataformat.smile.fuzz;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class Fuzz_426_65126IOOBETest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // [dataformats-binary#426]
+    @Test
     public void testInvalidIOOBE() throws Exception
     {
         final byte[] input = readResource("/data/clusterfuzz-smile-65126.smile");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/ArrayGenerationTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/ArrayGenerationTest.java
index 7779fa803..18e42b6fe 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/ArrayGenerationTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/ArrayGenerationTest.java
@@ -2,10 +2,15 @@
 
 import java.io.ByteArrayOutputStream;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 /**
  * Basic testing for scalar-array write methods added in 2.8.
  */
@@ -13,18 +18,21 @@ public class ArrayGenerationTest extends BaseTestForSmile
 {
     private final SmileFactory FACTORY = new SmileFactory();
 
+    @Test
     public void testIntArray() throws Exception
     {
         _testIntArray(false);
         _testIntArray(true);
     }
 
+    @Test
     public void testLongArray() throws Exception
     {
         _testLongArray(false);
         _testLongArray(true);
     }
 
+    @Test
     public void testDoubleArray() throws Exception
     {
         _testDoubleArray(false);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorBinaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorBinaryTest.java
index 034fb4813..78a4eaf5a 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorBinaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorBinaryTest.java
@@ -2,29 +2,32 @@
 
 import java.io.*;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;
 import com.fasterxml.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class GeneratorBinaryTest extends BaseTestForSmile
 {
+    @Test
     public void testStreamingBinaryRaw() throws Exception
     {
         _testStreamingBinary(true, false);
         _testStreamingBinary(true, true);
     }
 
+    @Test
     public void testStreamingBinary7Bit() throws Exception
     {
         _testStreamingBinary(false, false);
         _testStreamingBinary(false, true);
     }
 
+    @Test
     public void testBinaryWithoutLength() throws Exception
     {
         final SmileFactory f = new SmileFactory();
@@ -38,6 +41,7 @@ public void testBinaryWithoutLength() throws Exception
         g.close();
     }
 
+    @Test
     public void testStreamingBinaryPartly() throws Exception {
         _testStreamingBinaryPartly(false, false);
         _testStreamingBinaryPartly(false, true);
@@ -119,7 +123,7 @@ private void _testStreamingBinary(boolean rawBinary, boolean throttle) throws Ex
             assertToken(JsonToken.START_ARRAY, p.nextToken());
             assertToken(JsonToken.VALUE_EMBEDDED_OBJECT, p.nextToken());
             byte[] b = p.getBinaryValue();
-            Assert.assertArrayEquals(INPUT, b);
+            assertArrayEquals(INPUT, b);
             assertToken(JsonToken.END_ARRAY, p.nextToken());
             p.close();
         }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorDupHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorDupHandlingTest.java
index 2b9e05ea6..df842c6be 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorDupHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorDupHandlingTest.java
@@ -1,18 +1,26 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class GeneratorDupHandlingTest extends BaseTestForSmile
 {
+    @Test
     public void testSimpleDupsEagerlyBytes() throws Exception {
         _testSimpleDups(false, new JsonFactory());
     }
 
     // Testing ability to enable checking after construction of
     // generator, not just via JsonFactory
+    @Test
     public void testSimpleDupsLazilyBytes() throws Exception {
         final JsonFactory f = new JsonFactory();
         assertFalse(f.isEnabled(JsonGenerator.Feature.STRICT_DUPLICATE_DETECTION));
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java
index 0785111f8..828e4cda9 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java
@@ -2,14 +2,18 @@
 
 import java.io.ByteArrayOutputStream;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.dataformat.smile.*;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class GeneratorInvalidCallsTest extends BaseTestForSmile
 {
     private final SmileFactory SMILE_F = new SmileFactory();
 
+    @Test
     public void testInvalidFieldNameInRoot() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java
index 9271e9067..0b3685275 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/LenientUnicodeSmileGenerationTest.java
@@ -2,14 +2,17 @@
 
 import java.io.ByteArrayOutputStream;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamWriteException;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.dataformat.smile.*;
+import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class LenientUnicodeSmileGenerationTest extends BaseTestForSmile
 {
     private final SmileMapper MAPPER = smileMapper();
@@ -20,6 +23,7 @@ public class LenientUnicodeSmileGenerationTest extends BaseTestForSmile
     /**
      * Test that encoding a String containing invalid surrogates fail with an exception
      */
+    @Test
     public void testFailForInvalidSurrogate() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -84,6 +88,7 @@ public void testFailForInvalidSurrogate() throws Exception
     /**
      * Test that when the lenient unicode feature is enabled, the replacement character is used to fix invalid sequences
      */
+    @Test
     public void testRecoverInvalidSurrogate1() throws Exception
     {
         // Unmatched first surrogate character
@@ -96,6 +101,7 @@ public void testRecoverInvalidSurrogate1() throws Exception
         _writeAndVerifyLenientString("x\ude01x", "x\ufffdx");
     }
 
+    @Test
     public void testRecoverInvalidSurrogate2() throws Exception
     {
         _writeAndVerifyLenientString("X\ud83dY", "X\ufffdY");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGenerator.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGenerator.java
index 8c8f2af8b..e7c52cbeb 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGenerator.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGenerator.java
@@ -1,8 +1,11 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.HashMap;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.io.SerializedString;
@@ -11,12 +14,14 @@
 import com.fasterxml.jackson.dataformat.smile.*;
 
 import static com.fasterxml.jackson.dataformat.smile.SmileConstants.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestGenerator extends BaseTestForSmile
 {
     /**
      * Test for verifying handling of 'true', 'false' and 'null' literals
      */
+    @Test
     public void testSimpleLiterals() throws Exception
     {
         // false, no header (or frame marker)
@@ -70,6 +75,7 @@ public void testSimpleLiterals() throws Exception
                 TOKEN_LITERAL_NULL, BYTE_MARKER_END_OF_CONTENT);
     }
 
+    @Test
     public void testSimpleArray() throws Exception
     {
     	// First: empty array (2 bytes)
@@ -105,6 +111,7 @@ public void testSimpleArray() throws Exception
         assertEquals(7, out.toByteArray().length);
     }
 
+    @Test
     public void testShortAscii() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -115,6 +122,7 @@ public void testShortAscii() throws Exception
     }
 
 
+    @Test
     public void testTrivialObject() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -128,6 +136,7 @@ public void testTrivialObject() throws Exception
         		SmileConstants.TOKEN_LITERAL_END_OBJECT);
     }
 
+    @Test
     public void test2FieldObject() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -143,6 +152,7 @@ public void test2FieldObject() throws Exception
         		SmileConstants.TOKEN_LITERAL_END_OBJECT);
     }
 
+    @Test
     public void testAnotherObject() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -169,6 +179,7 @@ public void testAnotherObject() throws Exception
     }
 
     // [dataformat-smile#30]: problems with empty string key
+    @Test
     public void testObjectWithEmptyKey() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -236,6 +247,7 @@ private void _verifyName(JsonParser p, int mode, String exp) throws Exception
     /**
      * Test to verify that
      */
+    @Test
     public void testSharedStrings() throws Exception
     {
         // first, no sharing, 2 separate Strings
@@ -249,6 +261,7 @@ public void testSharedStrings() throws Exception
         }
     }
 
+    @Test
     public void testWithMap() throws Exception
     {
         final SmileFactory smileFactory = new SmileFactory();
@@ -274,6 +287,7 @@ public void testWithMap() throws Exception
     }
 
     // [Issue#6], missing overrides for File-backed generator
+    @Test
     public void testWriteToFile() throws Exception
     {
         final SmileFactory smileFactory = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBufferRecycle.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBufferRecycle.java
index 8a1eac0bb..b9f5d6a65 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBufferRecycle.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorBufferRecycle.java
@@ -1,17 +1,23 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
 /* Test based on kimchy's issue (see https://gist.github.com/853232);
  * exhibits an issue with buffer recycling.
  */
 public class TestGeneratorBufferRecycle extends BaseTestForSmile
 {
+    @Test
     public void testMaps() throws Exception
     {
         SmileFactory factory = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorClosing.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorClosing.java
index f48ce5b2c..fdc3d98a4 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorClosing.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorClosing.java
@@ -1,10 +1,14 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.testutil.ByteOutputStreamForTesting;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Set of basic unit tests that verify aspect of closing a
  * {@link JsonGenerator} instance. This includes both closing
@@ -30,6 +34,7 @@ public class TestGeneratorClosing extends BaseTestForSmile
      * automatic closing should occur, nor explicit one unless specific
      * forcing method is used.
      */
+    @Test
     public void testNoAutoCloseGenerator() throws Exception
     {
         JsonFactory f = newFactory();
@@ -52,6 +57,7 @@ public void testNoAutoCloseGenerator() throws Exception
         }
     }
 
+    @Test
     public void testCloseGenerator() throws Exception
     {
         JsonFactory f = newFactory();
@@ -68,6 +74,7 @@ public void testCloseGenerator() throws Exception
         assertTrue(output.isClosed());
     }
 
+    @Test
     public void testNoAutoCloseOutputStream() throws Exception
     {
         JsonFactory f = newFactory();
@@ -83,6 +90,7 @@ public void testNoAutoCloseOutputStream() throws Exception
     }
 
     @SuppressWarnings("resource")
+    @Test
     public void testAutoFlushOrNot() throws Exception
     {
         JsonFactory f = newFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongSharedRefs.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongSharedRefs.java
index 82bbbfe01..ca6ebd9dd 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongSharedRefs.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongSharedRefs.java
@@ -1,16 +1,19 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestGeneratorLongSharedRefs extends BaseTestForSmile
 {
     // [smile#18]: problems encoding long shared-string references
+    @Test
     public void testIssue18EndOfDocByteViaFields() throws Exception
     {
         ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
@@ -84,6 +87,7 @@ public void testIssue18EndOfDocByteViaFields() throws Exception
         }
     }
 
+    @Test
     public void testIssue18EndOfDocByteViaStringValues() throws Exception
     {
         ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongStrings.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongStrings.java
index d8b8f838d..352d75586 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongStrings.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorLongStrings.java
@@ -3,15 +3,18 @@
 import java.io.*;
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestGeneratorLongStrings extends BaseTestForSmile
 {
     final static int DOC_LEN = 2000000; // 2 meg test doc
 
+    @Test
     public void testLongWithMultiBytes() throws Exception
     {
         SmileFactory f = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java
index 47d51b813..3854d5d6f 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorNumbers.java
@@ -2,13 +2,16 @@
 
 import java.io.ByteArrayOutputStream;
 
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileUtil;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestGeneratorNumbers
     extends BaseTestForSmile
 {
+    @Test
     public void testSmallInts() throws Exception
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -42,6 +45,7 @@ public void testSmallInts() throws Exception
         _verifyBytes(out.toByteArray(), (byte) (0xC0 + SmileUtil.zigzagEncode(-16)));
     }
 
+    @Test
     public void testOtherInts() throws Exception
     {
     	// beyond tiny ints, 6-bit values take 2 bytes
@@ -109,6 +113,7 @@ public void testOtherInts() throws Exception
         assertEquals(11, out.toByteArray().length);
     }
 
+    @Test
     public void testFloats() throws Exception
     {
         // float length is fixed, 6 bytes
@@ -119,6 +124,7 @@ public void testFloats() throws Exception
         assertEquals(6, out.toByteArray().length);
     }
 
+    @Test
     public void testDoubles() throws Exception
     {
         // double length is fixed, 11 bytes
@@ -130,6 +136,7 @@ public void testDoubles() throws Exception
     }
 
     // #16: Problems with 'Stringified' numbers
+    @Test
     public void testNumbersAsString() throws Exception
     {
         ByteArrayOutputStream out;
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorSymbols.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorSymbols.java
index 2addceaee..9dd05aa2b 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorSymbols.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorSymbols.java
@@ -1,11 +1,14 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class TestGeneratorSymbols extends BaseTestForSmile
 {
@@ -13,6 +16,7 @@ public class TestGeneratorSymbols extends BaseTestForSmile
      * Simple test to verify that second reference will not output new String, but
      * rather references one output earlier.
      */
+    @Test
     public void testSharedNameSimple() throws Exception
     {
         // false, no header (or frame marker)
@@ -32,6 +36,7 @@ public void testSharedNameSimple() throws Exception
     }
 
     // same as above, but with name >= 64 characters
+    @Test
     public void testSharedNameSimpleLong() throws Exception
     {
         _testSharedNameSimpleLong("ABCD");
@@ -89,17 +94,20 @@ private void _testSharedNameSimpleLong(String suffix) throws Exception
         }
     }
 
+    @Test
     public void testLongNamesNonShared() throws Exception
     {
         _testLongNames(false);
     }
 
+    @Test
     public void testLongNamesShared() throws Exception
     {
         _testLongNames(true);
     }
 
     // [Issue#8] Test by: M. Tarik Yurt  / mtyurt@gmail.com
+    @Test
     public void testExpandSeenNames() throws Exception
     {
         byte[] data = _smileDoc("{\"a1\":null,\"a2\":null,\"a3\":null,\"a4\":null,\"a5\":null,\"a6\":null,\"a7\":null,\"a8\":null," +
@@ -135,6 +143,7 @@ public void testExpandSeenNames() throws Exception
     }
 
     // [Issue#8] Test by: M. Tarik Yurt  / mtyurt@gmail.com
+    @Test
     public void testExpandSeenStringValues() throws Exception
     {
         String json = "{\"a1\":\"v1\",\"a2\":\"v2\",\"a3\":\"v3\",\"a4\":\"v4\",\"a5\":\"v5\",\"a6\":\"v6\",\"a7\":\"v7\",\"a8\":\"v8\"," +
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java
index b66a9c104..acacc7254 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithRawUtf8.java
@@ -1,17 +1,16 @@
 package com.fasterxml.jackson.dataformat.smile.gen;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 
 /**
  * Test to verify handling of "raw String value" write methods that by-pass
@@ -22,6 +21,7 @@
  */
 public class TestGeneratorWithRawUtf8 extends BaseTestForSmile
 {
+    @Test
     public void testUtf8RawStrings() throws Exception
     {
         // Let's create set of Strings to output; no ctrl chars as we do raw
@@ -63,6 +63,7 @@ public void testUtf8RawStrings() throws Exception
      * Unit test for "JsonGenerator.writeUTF8String()", which needs
      * to handle escaping properly
      */
+    @Test
     public void testUtf8StringsWithEscaping() throws Exception
     {
         // Let's create set of Strings to output; do include control chars too:
@@ -97,6 +98,7 @@ public void testUtf8StringsWithEscaping() throws Exception
      *
      * @author David Yu
      */
+    @Test
     public void testIssue492() throws Exception
     {
         doTestIssue492(false);
@@ -164,20 +166,20 @@ private void doTestIssue492(boolean asUtf8String) throws Exception
         assertToken(parser.nextToken(), JsonToken.START_OBJECT);
 
         assertToken(parser.nextToken(), JsonToken.FIELD_NAME);
-        assertEquals(parser.currentName(), "name");
+        assertEquals("name", parser.currentName());
         assertToken(parser.nextToken(), JsonToken.VALUE_STRING);
-        assertEquals(parser.getText(), "PojoFoo");
+        assertEquals("PojoFoo", parser.getText());
 
         assertToken(parser.nextToken(), JsonToken.FIELD_NAME);
-        assertEquals(parser.currentName(), "collection");
+        assertEquals("collection", parser.currentName());
         assertToken(parser.nextToken(), JsonToken.START_OBJECT);
 
         assertToken(parser.nextToken(), JsonToken.FIELD_NAME);
-        assertEquals("Should have property with name 'v'", parser.currentName(), "v");
+        assertEquals("v", parser.currentName(), "Should have property with name 'v'");
         assertToken(parser.nextToken(), JsonToken.START_ARRAY);
 
         assertToken(parser.nextToken(), JsonToken.VALUE_STRING);
-        assertEquals("Should get String value '1'", parser.getText(), "1");
+        assertEquals("1", parser.getText(), "Should get String value '1'");
 
         assertToken(parser.nextToken(), JsonToken.END_ARRAY);
         assertToken(parser.nextToken(), JsonToken.END_OBJECT);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithSerializedString.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithSerializedString.java
index 45734df16..d911ef1e8 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithSerializedString.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/TestGeneratorWithSerializedString.java
@@ -2,10 +2,15 @@
 
 import java.io.ByteArrayOutputStream;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
+import com.fasterxml.jackson.dataformat.smile.SmileFactory;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class TestGeneratorWithSerializedString extends BaseTestForSmile
 {
@@ -15,6 +20,7 @@ public class TestGeneratorWithSerializedString extends BaseTestForSmile
     private final SerializedString quotedName = new SerializedString(NAME_WITH_QUOTES);
     private final SerializedString latin1Name = new SerializedString(NAME_WITH_LATIN1);
 
+    @Test
     public void testSimple() throws Exception
     {
         SmileFactory sf = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/dos/CyclicSmileDataSerTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/dos/CyclicSmileDataSerTest.java
index c83c55c1f..61adad4ce 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/dos/CyclicSmileDataSerTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/dos/CyclicSmileDataSerTest.java
@@ -3,12 +3,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fasterxml.jackson.core.StreamWriteConstraints;
-
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.StreamWriteConstraints;
+import com.fasterxml.jackson.databind.DatabindException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Simple unit tests to verify that we fail gracefully if you attempt to serialize
  * data that is cyclic (eg a list that contains itself).
@@ -17,6 +20,7 @@ public class CyclicSmileDataSerTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testListWithSelfReference() throws Exception {
         List<Object> list = new ArrayList<>();
         list.add(list);
@@ -26,8 +30,8 @@ public void testListWithSelfReference() throws Exception {
         } catch (DatabindException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamWriteConstraints.DEFAULT_MAX_DEPTH + 1);
-            assertTrue("DatabindException message is as expected?",
-                    e.getMessage().startsWith(exceptionPrefix));
+            assertTrue(e.getMessage().startsWith(exceptionPrefix),
+                    "DatabindException message is as expected?");
         }
     }
 }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BiggerDataParseTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BiggerDataParseTest.java
index d2935abe2..e12eccf8e 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BiggerDataParseTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BiggerDataParseTest.java
@@ -1,12 +1,17 @@
 package com.fasterxml.jackson.dataformat.smile.mapper;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
 import java.util.*;
 
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 /**
  * Bigger test to try to do smoke-testing of overall functionality,
  * using more sizable (500k of JSON, 200k of Smile) dataset.
@@ -82,6 +87,7 @@ static class Area {
 
     private final ObjectMapper JSON_MAPPER = new JsonMapper();
 
+    @Test
     public void testReading() throws Exception
     {
         Citm citm0 = JSON_MAPPER.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
@@ -112,6 +118,7 @@ public void testReading() throws Exception
 		assertEquals(1, citm.venueNames.size());
 	}
 
+	@Test
 	public void testRoundTrip() throws Exception
 	{
 		Citm citm0 = JSON_MAPPER.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
@@ -143,7 +150,8 @@ public void testRoundTrip() throws Exception
 		assertEquals(citm.venueNames.size(), citm2.venueNames.size());
 	}
 
-	  public void testIssue17BoundaryWithFloat() throws Exception
+	@Test
+	public void testIssue17BoundaryWithFloat() throws Exception
 	  {
 	      _testWithFloats(false);
            _testWithFloats(true);
@@ -168,7 +176,7 @@ private void _testWithFloats(boolean useHeader) throws Exception
 
            for (int i = 0; i < data.length; ++i) {
                if (data[i] != decoded[i]) {
-                   assertEquals("Different value at #"+i, data[i], decoded[i]);
+                   assertEquals(data[i], decoded[i], "Different value at #"+i);
                }
            }
 	  }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BinaryReadTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BinaryReadTest.java
index c8059e0ec..200b572d7 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BinaryReadTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/BinaryReadTest.java
@@ -1,26 +1,25 @@
 package com.fasterxml.jackson.dataformat.smile.mapper;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.BinaryNode;
-
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 import com.fasterxml.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class BinaryReadTest extends BaseTestForSmile
 {
     final static class Bytes {
@@ -59,6 +58,7 @@ public Bytes3(byte[] b) {
                 .build()
             ).build();
 
+    @Test
     public void testSmallBinaryValues() throws Exception {
         _testSmallBinaryValues(MAPPER_7BITS);
         _testSmallBinaryValues(MAPPER_RAW);
@@ -71,6 +71,7 @@ private void _testSmallBinaryValues(ObjectMapper mapper) throws Exception {
         _testBinary(mapper, 100);
     }
 
+    @Test
     public void testMediumBinaryValues() throws Exception {
         _testMediumBinaryValues(MAPPER_7BITS);
         _testMediumBinaryValues(MAPPER_RAW);
@@ -82,6 +83,7 @@ private void _testMediumBinaryValues(ObjectMapper mapper) throws Exception {
         _testBinary(mapper, 8900);
     }
 
+    @Test
     public void testLargeBinaryValues() throws Exception {
         _testLargeBinaryValues(MAPPER_7BITS);
         _testLargeBinaryValues(MAPPER_RAW);
@@ -95,6 +97,7 @@ private void _testLargeBinaryValues(ObjectMapper mapper) throws Exception {
     }
 
     // And then one test just to ensure no state corruption occurs
+    @Test
     public void testMultipleBinaryFields() throws Exception
     {
         _testMultipleBinaryFields(MAPPER_7BITS);
@@ -111,12 +114,13 @@ public void _testMultipleBinaryFields(ObjectMapper mapper) throws Exception
         byte[] raw = mapper.writeValueAsBytes(input);
 
         Bytes3 result = mapper.readValue(raw, Bytes3.class);
-        Assert.assertArrayEquals(input.bytes1, result.bytes1);
-        Assert.assertArrayEquals(input.bytes2, result.bytes2);
-        Assert.assertArrayEquals(input.bytes3, result.bytes3);
+        assertArrayEquals(input.bytes1, result.bytes1);
+        assertArrayEquals(input.bytes2, result.bytes2);
+        assertArrayEquals(input.bytes3, result.bytes3);
     }
 
     // Let's also verify handling of truncated (invalid) binary values
+    @Test
     public void testTruncatedBinaryValues() throws Exception {
         _testTruncatedBinaryValues(MAPPER_7BITS);
         _testTruncatedBinaryValues(MAPPER_RAW);
@@ -153,14 +157,14 @@ private void _testBinary(ObjectMapper mapper, int size) throws Exception
         byte[] raw = mapper.writeValueAsBytes(input);
         byte[] b2 = mapper.readValue(raw, byte[].class);
         assertNotNull(b2);
-        Assert.assertArrayEquals(input, b2);
+        assertArrayEquals(input, b2);
 
         // then as POJO member
         raw = mapper.writeValueAsBytes(new Bytes(input));
         Bytes bytes = mapper.readValue(raw, Bytes.class);
         assertNotNull(bytes);
         assertNotNull(bytes.bytes);
-        Assert.assertArrayEquals(input, bytes.bytes);
+        assertArrayEquals(input, bytes.bytes);
 
         // then using incremental access method
         raw = mapper.writeValueAsBytes(input);
@@ -172,7 +176,7 @@ private void _testBinary(ObjectMapper mapper, int size) throws Exception
         assertEquals(input.length, p.readBinaryValue(bout));
         assertEquals(input.length, bout.size());
         b2 = bout.toByteArray();
-        Assert.assertArrayEquals(input, b2);
+        assertArrayEquals(input, b2);
         assertNull(p.nextToken());
         p.close();
         in.close();
@@ -194,7 +198,7 @@ private void _testBinary(ObjectMapper mapper, int size) throws Exception
         assertNotNull(n);
         assertTrue(n.isBinary());
         BinaryNode bn = (BinaryNode) n;
-        Assert.assertArrayEquals(input, bn.binaryValue());
+        assertArrayEquals(input, bn.binaryValue());
 
         _testBinaryInArray(mapper, size);
     }
@@ -209,8 +213,8 @@ private void _testBinaryInArray(ObjectMapper mapper, int size) throws Exception
                 ByteArrays.class);
         assertNotNull(result.arrays);
         assertEquals(2, result.arrays.size());
-        Assert.assertArrayEquals(b1, result.arrays.get(0));
-        Assert.assertArrayEquals(b2, result.arrays.get(1));
+        assertArrayEquals(b1, result.arrays.get(0));
+        assertArrayEquals(b2, result.arrays.get(1));
 
         // and once more, now as JsonNode
         JsonNode n = mapper.readTree(doc);
@@ -221,11 +225,11 @@ private void _testBinaryInArray(ObjectMapper mapper, int size) throws Exception
 
         JsonNode bin = n2.get(0);
         assertTrue(bin.isBinary());
-        Assert.assertArrayEquals(b1, ((BinaryNode) bin).binaryValue());
+        assertArrayEquals(b1, ((BinaryNode) bin).binaryValue());
 
         bin = n2.get(1);
         assertTrue(bin.isBinary());
-        Assert.assertArrayEquals(b2, ((BinaryNode) bin).binaryValue());
+        assertArrayEquals(b2, ((BinaryNode) bin).binaryValue());
     }
 
     private byte[] _bytes(int size, int offset) {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/MapperFeaturesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/MapperFeaturesTest.java
index 0b341ea91..f3a0b94c4 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/MapperFeaturesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/MapperFeaturesTest.java
@@ -2,10 +2,16 @@
 
 import java.io.IOException;
 
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+
 public class MapperFeaturesTest extends BaseTestForSmile
 {
     static class Bean {
@@ -18,6 +24,7 @@ static class Bean {
     /**********************************************************
      */
     // Let's ensure indentation doesn't break anything (should be NOP)
+    @Test
     public void testIndent() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper(new SmileFactory());
@@ -30,6 +37,7 @@ public void testIndent() throws Exception
         assertEquals(42, result.value);
     }
 
+    @Test
     public void testCopy() throws IOException
     {
         ObjectMapper mapper1 = smileMapper();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java
index 55a5074b6..d53f7db92 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java
@@ -4,16 +4,16 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import org.junit.jupiter.api.Test;
 
-import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
-
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.smile.*;
 
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class NumberBeanTest extends BaseTestForSmile
 {
@@ -50,6 +50,7 @@ static class NestedBigDecimalHolder2784 {
     private final ObjectMapper MAPPER = smileMapper();
 
     // for [dataformats-binary#31]
+    @Test
     public void testDoubleArrayRoundTrip() throws Exception
     {
         double[][] inputArray = new double[][]{ { 0.25, -1.5 } };
@@ -63,6 +64,7 @@ public void testDoubleArrayRoundTrip() throws Exception
         assertEquals(inputArray[0][1], result.values[0][1]);
     }
 
+    @Test
     public void testNumberTypeRetainingInt() throws Exception
     {
         NumberWrapper result;
@@ -96,6 +98,7 @@ public void testNumberTypeRetainingInt() throws Exception
         assertEquals(BigInteger.valueOf(-42L), result.nr);
     }
 
+    @Test
     public void testNumberTypeRetainingFP() throws Exception
     {
         NumberWrapper result;
@@ -129,6 +132,7 @@ public void testNumberTypeRetainingFP() throws Exception
         assertEquals(new BigDecimal("0.100"), result.nr);
     }
 
+    @Test
     public void testNumberTypeRetainingBuffering() throws Exception
     {
         ByteArrayOutputStream bytes;
@@ -184,6 +188,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
     }
 
     // [databind#2784]
+    @Test
     public void testBigDecimalWithBuffering() throws Exception
     {
         final BigDecimal VALUE = new BigDecimal("5.00");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/ObjectIdTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/ObjectIdTest.java
index 8e8781b6c..6c182b3fb 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/ObjectIdTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/ObjectIdTest.java
@@ -1,9 +1,16 @@
 package com.fasterxml.jackson.dataformat.smile.mapper;
 
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
 public class ObjectIdTest extends BaseTestForSmile
 {
     @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
@@ -12,6 +19,7 @@ public static class D {
     }
 
     // [smile#19]
+    @Test
     public void testObjectIdAsUUID() throws Exception
     {
         ObjectMapper mapper = smileMapper();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java
index b1d571b2c..875990104 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/SmileMapperTest.java
@@ -1,30 +1,24 @@
 package com.fasterxml.jackson.dataformat.smile.mapper;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.SequenceInputStream;
+import java.io.*;
 import java.util.*;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SmileMapperTest extends BaseTestForSmile
 {
     static class BytesBean {
@@ -61,6 +55,7 @@ protected Wrapper() { }
 
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testBinary() throws IOException
     {
         byte[] input = new byte[] { 1, 2, 3, -1, 8, 0, 42 };
@@ -68,10 +63,11 @@ public void testBinary() throws IOException
         BytesBean result = MAPPER.readValue(smile, BytesBean.class);
 
         assertNotNull(result.bytes);
-        Assert.assertArrayEquals(input, result.bytes);
+        assertArrayEquals(input, result.bytes);
     }
 
     // [dataformats-binary#1711]
+    @Test
     public void testWrappedBinary() throws IOException
     {
         byte[] bytes = {1, 2, 3, 4, 5};
@@ -95,6 +91,7 @@ public void testWrappedBinary() throws IOException
     }
 
     // UUIDs should be written as binary (starting with 2.3)
+    @Test
     public void testUUIDs() throws IOException
     {
         UUID uuid = UUID.randomUUID();
@@ -113,6 +110,7 @@ public void testUUIDs() throws IOException
         p.close();
     }
 
+    @Test
     public void testWithNestedMaps() throws IOException
     {
         Map<Object,Object> map = new HashMap<Object,Object>();
@@ -130,6 +128,7 @@ public void testWithNestedMaps() throws IOException
     }
 
     // for [dataformat-smile#26]
+    @Test
     public void testIssue26ArrayOutOfBounds() throws Exception
     {
         SmileFactory f = new SmileFactory();
@@ -176,6 +175,7 @@ private byte[] _generateHugeDoc(SmileFactory f) throws IOException
     }
 
     // Test for [dataformats-binary#301]
+    @Test
     public void testStreamingFeaturesViaMapper() throws Exception
     {
         SmileMapper mapperWithHeaders = SmileMapper.builder()
@@ -209,6 +209,7 @@ public void testStreamingFeaturesViaMapper() throws Exception
     }
 
     // [databind#3212]
+    @Test
     public void testMapperCopy() throws Exception
     {
         SmileMapper src = smileMapper();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/TreeNodesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/TreeNodesTest.java
index 11b54ca19..b1789df1e 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/TreeNodesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/TreeNodesTest.java
@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.dataformat.smile.mapper;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,10 +8,13 @@
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class TreeNodesTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = new ObjectMapper(new SmileFactory());
 
+    @Test
     public void testSimple() throws Exception
     {
          // create the serialized JSON with byte array
@@ -33,9 +36,10 @@ public void testSimple() throws Exception
              fail("Expected binary node; got "+datNode.getClass().getName());
          }
          byte[] bytes = datNode.binaryValue();
-         Assert.assertArrayEquals(TEXT_BYTES, bytes);
+         assertArrayEquals(TEXT_BYTES, bytes);
      }
 
+    @Test
     public void testNumbers() throws Exception
     {
         ObjectNode root = MAPPER.createObjectNode();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/Base64AsBinaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/Base64AsBinaryTest.java
index 619df57fd..40a7481ad 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/Base64AsBinaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/Base64AsBinaryTest.java
@@ -3,15 +3,15 @@
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class Base64AsBinaryTest extends BaseTestForSmile
 {
     private final static String ENCODED_BASE64 = "VGVzdCE=";
@@ -26,6 +26,7 @@ public Base64AsBinaryTest() throws Exception {
     }
 
     // [dataformats-binary#284]: binary from Base64 encoded
+    @Test
     public void testGetBase64AsBinary() throws Exception
     {
         // First, verify regularly
@@ -44,13 +45,14 @@ public void testGetBase64AsBinary() throws Exception
             assertToken(JsonToken.FIELD_NAME, p.nextToken());
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             byte[] binary = p.getBinaryValue();
-            Assert.assertArrayEquals(DECODED_BASE64, binary);
+            assertArrayEquals(DECODED_BASE64, binary);
             assertToken(JsonToken.END_OBJECT, p.nextToken());
             assertNull(p.nextToken());
         }
     }
 
     // [dataformats-binary#284]: binary from Base64 encoded
+    @Test
     public void testReadBase64AsBinary() throws Exception
     {
         // And further via read
@@ -61,7 +63,7 @@ public void testReadBase64AsBinary() throws Exception
             ByteArrayOutputStream bytes = new ByteArrayOutputStream();
             int count = p.readBinaryValue(bytes);
             assertEquals(5, count);
-            Assert.assertArrayEquals(DECODED_BASE64, bytes.toByteArray());
+            assertArrayEquals(DECODED_BASE64, bytes.toByteArray());
             assertToken(JsonToken.END_OBJECT, p.nextToken());
             assertNull(p.nextToken());
         }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/BasicParserTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/BasicParserTest.java
index 2510da851..f64d53c59 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/BasicParserTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/BasicParserTest.java
@@ -2,18 +2,19 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileConstants;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class BasicParserTest extends BaseTestForSmile
 {
     // Unit tests for verifying that if header/signature is required,
     // lacking it is fatal
+    @Test
     public void testMandatoryHeader() throws IOException
     {
         // first test failing case
@@ -37,6 +38,7 @@ public void testMandatoryHeader() throws IOException
         p.close();
     }
 
+    @Test
     public void testSimple() throws IOException
     {
         byte[] data = _smileDoc("[ true, null, false ]", true);
@@ -69,6 +71,7 @@ private void _testSimple(boolean throttle, byte[] data) throws IOException
         p.close();
     }
 
+    @Test
     public void testIntInArray() throws IOException
     {
         byte[] data = _smileDoc("[ 25.0 ]");
@@ -83,6 +86,7 @@ public void testIntInArray() throws IOException
         p.close();
     }
 
+    @Test
     public void testArrayWithString() throws IOException
     {
         byte[] data = _smileDoc("[ \"abc\" ]");
@@ -102,6 +106,7 @@ public void testArrayWithString() throws IOException
         p.close();
     }
 
+    @Test
     public void testEmptyStrings() throws IOException
     {
         // first, empty key
@@ -154,6 +159,7 @@ public void testEmptyStrings() throws IOException
 
     // Test for ASCII String values longer than 64 bytes; separate
     // since handling differs
+    @Test
     public void testLongAsciiString() throws IOException
     {
         final String DIGITS = "1234567890";
@@ -171,6 +177,7 @@ public void testLongAsciiString() throws IOException
 
     //Test for non-ASCII String values longer than 64 bytes; separate
     // since handling differs
+    @Test
     public void testLongUnicodeString() throws IOException
     {
         final String DIGITS = "1234567890";
@@ -195,6 +202,7 @@ public void testLongUnicodeString() throws IOException
     // Simple test for encoding where "Unicode" string value is
     // actually ascii (which is fine, encoders need not ensure it is not,
     // it's just not guaranteeing content IS ascii)
+    @Test
     public void testShortAsciiAsUnicodeString() throws IOException
     {
         byte[] data = new byte[] {
@@ -207,6 +215,7 @@ public void testShortAsciiAsUnicodeString() throws IOException
         }
     }
 
+    @Test
     public void testTrivialObject() throws IOException
     {
         byte[] data = _smileDoc("{\"abc\":13}");
@@ -225,6 +234,7 @@ public void testTrivialObject() throws IOException
         p.close();
     }
 
+    @Test
     public void testSimpleObject() throws IOException
     {
         byte[] data = _smileDoc("{\"a\":8, \"b\" : [ true ], \"c\" : { }, \"d\":{\"e\":null}}");
@@ -269,6 +279,7 @@ public void testSimpleObject() throws IOException
     	p.close();
     }
 
+    @Test
     public void testNestedObject() throws IOException
     {
         byte[] data = _smileDoc("[{\"a\":{\"b\":[1]}}]");
@@ -292,12 +303,14 @@ public void testNestedObject() throws IOException
         p.close();
     }
 
+    @Test
     public void testJsonSampleDoc() throws IOException
     {
         byte[] data = _smileDoc(SAMPLE_DOC_JSON_SPEC);
         verifyJsonSpecSampleDoc(_smileParser(data), true);
     }
 
+    @Test
     public void testUnicodeStringValues() throws IOException
     {
         String uc = "\u00f6stl. v. Greenwich \u3333?";
@@ -345,6 +358,7 @@ public void testUnicodeStringValues() throws IOException
         p.close();
     }
 
+    @Test
     public void testUnicodePropertyNames() throws IOException
     {
         String uc = "\u00f6stl. v. Greenwich \u3333";
@@ -372,6 +386,7 @@ public void testUnicodePropertyNames() throws IOException
 
     // Simple test to verify that byte 0 is not used (an implementation
     // might mistakenly consider it a string value reference)
+    @Test
     public void testInvalidByte() throws IOException
     {
         byte[] data = new byte[] { SmileConstants.TOKEN_LITERAL_START_ARRAY,
@@ -391,6 +406,7 @@ public void testInvalidByte() throws IOException
     }
 
     // [JACKSON-629]
+    @Test
     public void testNameBoundary() throws IOException
     {
         SmileFactory f = smileFactory(true, true, false);
@@ -440,6 +456,7 @@ public void testNameBoundary() throws IOException
     }
 
     // [JACKSON-640]: Problem with getTextCharacters/Offset/Length
+    @Test
     public void testCharacters() throws IOException
     {
         // ensure we are using both back-ref types
@@ -488,6 +505,7 @@ public void testCharacters() throws IOException
     }
 
 
+    @Test
     public void testBufferRelease() throws IOException
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/DocBoundaryTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/DocBoundaryTest.java
index a8347344e..1071896c0 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/DocBoundaryTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/DocBoundaryTest.java
@@ -1,12 +1,14 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * Unit tests for verifying that multiple document output and document
@@ -15,26 +17,31 @@
 public class DocBoundaryTest
     extends BaseTestForSmile
 {
+    @Test
     public void testNoHeadersNoEndMarker() throws Exception
     {
         _verifyMultiDoc(false, false);
     }
 
+    @Test
     public void testHeadersNoEndMarker() throws Exception
     {
         _verifyMultiDoc(true, false);
     }
 
+    @Test
     public void testEndMarkerNoHeader() throws Exception
     {
         _verifyMultiDoc(false, true);
     }
 
+    @Test
     public void testHeaderAndEndMarker() throws Exception
     {
         _verifyMultiDoc(true, true);
     }
 
+    @Test
     public void testExtraHeader() throws Exception
     {
         // also; sprinkling headers can be used to segment document
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/FormatDetectionTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/FormatDetectionTest.java
index d4de96b3e..87ab3db36 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/FormatDetectionTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/FormatDetectionTest.java
@@ -1,9 +1,14 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class FormatDetectionTest extends BaseTestForSmile
 {
     static class POJO {
@@ -24,6 +29,7 @@ public POJO(int id, String name)
     /**********************************************************
      */
 
+    @Test
     public void testSimple() throws Exception
     {
         final ObjectMapper mapper = new ObjectMapper();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserBinaryHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserBinaryHandlingTest.java
index 747b429a1..c972f3403 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserBinaryHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserBinaryHandlingTest.java
@@ -1,14 +1,14 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ParserBinaryHandlingTest extends BaseTestForSmile
 {
@@ -19,40 +19,48 @@ public class ParserBinaryHandlingTest extends BaseTestForSmile
         139000
     };
 
+    @Test
     public void testRawAsArray() throws IOException
     {
         _testBinaryAsArray(true);
     }
 
+    @Test
     public void test7BitAsArray() throws IOException
     {
         _testBinaryAsArray(false);
     }
 
     // Added based on [JACKSON-376]
+    @Test
     public void testRawAsObject() throws IOException
     {
         _testBinaryAsObject(true);
     }
 
     // Added based on [JACKSON-376]
+    @Test
     public void test7BitAsObject() throws IOException
     {
         _testBinaryAsObject(false);
     }
 
+    @Test
     public void testRawAsRootValue() throws IOException {
         _testBinaryAsRoot(true);
     }
 
+    @Test
     public void test7BitAsRootValue() throws IOException {
         _testBinaryAsRoot(false);
     }
 
+    @Test
     public void testStreamingRaw() throws IOException {
         _testStreaming(true);
     }
 
+    @Test
     public void testStreamingEncoded() throws IOException {
         _testStreaming(false);
     }
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserDupHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserDupHandlingTest.java
index c0608b77f..3daf76723 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserDupHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserDupHandlingTest.java
@@ -1,11 +1,16 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ParserDupHandlingTest extends BaseTestForSmile
 {
+    @Test
     public void testSimpleDups() throws Exception
     {
         for (String json : new String[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserLocationTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserLocationTest.java
index 4a0c108e7..22ac3ecdc 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserLocationTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserLocationTest.java
@@ -2,14 +2,17 @@
 
 import java.io.*;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ParserLocationTest
     extends BaseTestForSmile
 {
+    @Test
     public void testSimpleOffsets() throws IOException
     {
         byte[] data = _smileDoc("[ true, null, false, 511 ]", true); // true -> write header
@@ -63,6 +66,7 @@ public void testSimpleOffsets() throws IOException
     }
 
     // for [databind-smile#24]
+    @Test
     public void testAscendingOffsets() throws Exception
     {
         // need to create big enough document, say at least 64k
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserNextXxxTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserNextXxxTest.java
index 81ae6a8f7..e7c0b10cd 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserNextXxxTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserNextXxxTest.java
@@ -1,21 +1,27 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
 import java.util.Random;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ParserNextXxxTest extends BaseTestForSmile
 {
+    @Test
     public void testIsNextTokenName() throws Exception
     {
         _testIsNextTokenName1();
         _testIsNextTokenName2();
     }
 
+    @Test
     public void testNextFieldName() throws Exception
     {
         final int TESTROUNDS = 223;
@@ -57,6 +63,7 @@ public void testNextFieldName() throws Exception
         }
     }
 
+    @Test
     public void testIssue38() throws Exception
     {
         final SmileFactory f = new SmileFactory();
@@ -73,6 +80,7 @@ public void testIssue38() throws Exception
         parser.close();
     }
 
+    @Test
     public void testNextNameWithLongContent() throws Exception
     {
         final SmileFactory f = new SmileFactory();
@@ -111,6 +119,7 @@ public void testNextNameWithLongContent() throws Exception
         parser.close();
     }
 
+    @Test
     public void testNextTextValue() throws Exception
     {
         final SmileFactory f = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserSymbolHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserSymbolHandlingTest.java
index 7f3a2bc62..522b8369e 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserSymbolHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/ParserSymbolHandlingTest.java
@@ -1,15 +1,17 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Unit tests for verifying that symbol handling works as planned, including
@@ -80,6 +82,7 @@ static class Content
      */
 
 
+    @Test
     public void testSharedNames() throws IOException
     {
         final int COUNT = 19000;
@@ -121,6 +124,7 @@ public void testSharedNames() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSharedStrings() throws IOException
     {
         final int count = 19000;
@@ -136,6 +140,7 @@ public void testSharedStrings() throws IOException
         verifyStringValues(shared, count);
     }
 
+    @Test
     public void testSharedStringsInArrays() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -162,6 +167,7 @@ public void testSharedStringsInArrays() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSharedStringsInObject() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -190,6 +196,7 @@ public void testSharedStringsInObject() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSharedStringsMixed() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -311,6 +318,7 @@ public void testSharedStringsMixed() throws IOException
         jp.close();
     }
 
+    @Test
     public void testDataBindingAndShared() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -347,6 +355,7 @@ public void testDataBindingAndShared() throws IOException
     /**
      * Reproducing [JACKSON-561] (and [JACKSON-562])
      */
+    @Test
     public void testIssue562() throws IOException
     {
         JsonFactory factory = new SmileFactory();
@@ -381,6 +390,7 @@ public void testIssue562() throws IOException
     /**
      * Verification that [JACKSON-564] was fixed.
      */
+    @Test
     public void testIssue564() throws Exception
     {
         JsonFactory factory = new SmileFactory();
@@ -459,6 +469,7 @@ public void testIssue564() throws Exception
         parser.close();
     }
 
+    @Test
     public void testCorruptName34() throws Exception
     {
         SmileFactory factory = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileDetectionTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileDetectionTest.java
index 1eb7a097c..25448cc14 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileDetectionTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileDetectionTest.java
@@ -1,19 +1,20 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.format.DataFormatDetector;
-import com.fasterxml.jackson.core.format.DataFormatMatcher;
-import com.fasterxml.jackson.core.format.MatchStrength;
+import com.fasterxml.jackson.core.format.*;
+import com.fasterxml.jackson.dataformat.smile.*;
 
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SmileDetectionTest extends BaseTestForSmile
 {
 
+    @Test
     public void testSimpleObjectWithHeader() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -38,6 +39,7 @@ public void testSimpleObjectWithHeader() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSimpleObjectWithoutHeader() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -59,6 +61,7 @@ public void testSimpleObjectWithoutHeader() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSimpleArrayWithHeader() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -81,6 +84,7 @@ public void testSimpleArrayWithHeader() throws IOException
         jp.close();
     }
 
+    @Test
     public void testSimpleArrayWithoutHeader() throws IOException
     {
         SmileFactory f = new SmileFactory();
@@ -111,6 +115,7 @@ public void testSimpleArrayWithoutHeader() throws IOException
      * Let's use 0xFD since it can not be included (except in raw binary;
      * use of which requires header to be present)
      */
+    @Test
     public void testSimpleInvalid() throws Exception
     {
         DataFormatDetector detector = new DataFormatDetector(new SmileFactory());
@@ -128,6 +133,7 @@ public void testSimpleInvalid() throws Exception
     /**********************************************************
      */
 
+    @Test
     public void testSmileVsJson() throws IOException
     {
         SmileFactory f = new SmileFactory();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileNumberParsingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileNumberParsingTest.java
index 5aecc4a54..5f8264f13 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileNumberParsingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SmileNumberParsingTest.java
@@ -1,20 +1,23 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.InputCoercionException;
 import com.fasterxml.jackson.core.exc.StreamConstraintsException;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SmileNumberParsingTest
     extends BaseTestForSmile
 {
+    @Test
     public void testIntsMedium() throws IOException
     {
         byte[] data = _smileDoc("255");
@@ -49,6 +52,7 @@ public void testIntsMedium() throws IOException
         p.close();
     }
 
+    @Test
     public void testMinMaxInts() throws IOException
     {
         byte[] data = _smileDoc(String.valueOf(Integer.MAX_VALUE));
@@ -67,6 +71,7 @@ public void testMinMaxInts() throws IOException
         p.close();
     }
 
+    @Test
     public void testIntsInObjectSkipping() throws IOException
     {
     	byte[] data = _smileDoc("{\"a\":200,\"b\":200}");
@@ -84,6 +89,7 @@ public void testIntsInObjectSkipping() throws IOException
      p.close();
     }
 
+    @Test
     public void testBorderLongs() throws IOException
     {
         long l = (long) Integer.MIN_VALUE - 1L;
@@ -126,6 +132,7 @@ public void testBorderLongs() throws IOException
         p.close();
     }
 
+    @Test
     public void testLongs() throws IOException
     {
         long l = Long.MAX_VALUE;
@@ -161,6 +168,7 @@ public void testLongs() throws IOException
         p.close();
     }
 
+    @Test
     public void testArrayWithInts() throws IOException
     {
         byte[] data = _smileDoc("[ 1, 0, -1, 255, -999, "
@@ -205,6 +213,7 @@ public void testArrayWithInts() throws IOException
     	p.close();
     }
 
+    @Test
     public void testFloats() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -230,6 +239,7 @@ public void testFloats() throws IOException
         p.close();
     }
 
+    @Test
     public void testDoubles() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -255,6 +265,7 @@ public void testDoubles() throws IOException
         p.close();
     }
 
+    @Test
     public void testArrayWithDoubles() throws IOException
     {
         final double[] values = new double[] {
@@ -291,6 +302,7 @@ public void testArrayWithDoubles() throws IOException
         p.close();
     }
 
+    @Test
     public void testObjectWithDoubles() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -328,6 +340,7 @@ public void testObjectWithDoubles() throws IOException
         p.close();
     }
 
+    @Test
     public void testBigInteger() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -360,6 +373,7 @@ public void testBigInteger() throws IOException
         p.close();
     }
 
+    @Test
     public void testBigDecimal() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -393,6 +407,7 @@ public void testBigDecimal() throws IOException
         p.close();
     }
 
+    @Test
     public void testVeryBigDecimal() throws IOException
     {
         final int len = 10000;
@@ -413,12 +428,13 @@ public void testVeryBigDecimal() throws IOException
                 p.getNumberType();
                 fail("expected StreamConstraintsException");
             } catch (StreamConstraintsException nfe) {
-                assertTrue("unexpected exception message: " + nfe.getMessage(),
-                        nfe.getMessage().startsWith("Number value length (4153) exceeds the maximum allowed"));
+                assertTrue(nfe.getMessage().startsWith("Number value length (4153) exceeds the maximum allowed"),
+                        "unexpected exception message: " + nfe.getMessage());
             }
         }
     }
 
+    @Test
     public void testVeryBigDecimalWithUnlimitedNumLength() throws IOException
     {
         final int len = 10000;
@@ -449,6 +465,7 @@ public void testVeryBigDecimalWithUnlimitedNumLength() throws IOException
         }
     }
 
+    @Test
     public void testMixedAccessForInts() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
@@ -519,6 +536,7 @@ public void testMixedAccessForInts() throws IOException
         p.close();
     }
 
+    @Test
     public void testMixedAccessForFloats() throws IOException
     {
         ByteArrayOutputStream bo = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTable312Test.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTable312Test.java
index e22e7479c..a4a8e8000 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTable312Test.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTable312Test.java
@@ -2,33 +2,42 @@
 
 import java.nio.charset.StandardCharsets;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class SymbolTable312Test extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
 
+    @Test
     public void testNullHandling1Quad() throws Exception
     {
         _testNullHandling(1);
         _testNullHandling(2);
     }
 
+    @Test
     public void testNullHandling2Quads() throws Exception
     {
         _testNullHandling(5);
         _testNullHandling(6);
     }
 
+    @Test
     public void testNullHandling3Quads() throws Exception
     {
         _testNullHandling(9);
         _testNullHandling(10);
     }
 
+    @Test
     public void testNullHandlingNQuads() throws Exception
     {
         _testNullHandling(13);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTableTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTableTest.java
index 2af47de36..401b22e7f 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTableTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/SymbolTableTest.java
@@ -3,16 +3,16 @@
 import java.lang.reflect.Field;
 import java.util.Random;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
-
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileParserBase;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.databind.SmileMapper;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SymbolTableTest extends BaseTestForSmile
 {
     static class Point {
@@ -24,6 +24,7 @@ static class Point {
             .build())
             .build();
 
+    @Test
     public void testSimpleDefault() throws Exception
     {
         final SmileMapper vanillaMapper = smileMapper();
@@ -81,6 +82,7 @@ public void testSimpleDefault() throws Exception
 
     // [dataformats-binary#252]: should be able to prevent canonicalization
     // Assumption: there is still non-null symbol table, but has "no canonicalization"
+    @Test
     public void testNoCanonicalizeWithMapper() throws Exception
     {
         final byte[] doc = _smileDoc(a2q("{ 'x':13, 'y':-999}"));
@@ -92,6 +94,7 @@ public void testNoCanonicalizeWithMapper() throws Exception
     }
 
     // [dataformats-binary#252]: should be able to prevent canonicalization
+    @Test
     public void testSimpleNoCanonicalize() throws Exception
     {
         final String[] fieldNames = new String[] {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/TestParserNames.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/TestParserNames.java
index 4aa3a9ff0..87589a9db 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/TestParserNames.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/TestParserNames.java
@@ -1,19 +1,27 @@
 package com.fasterxml.jackson.dataformat.smile.parse;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.Random;
 
-import com.fasterxml.jackson.core.*;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileParser;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class TestParserNames extends BaseTestForSmile
 {
+    @Test
     public void testLongNames() throws IOException
     {
         _testWithName(generateName(5000));
     }
 
+    @Test
     public void testJsonBinForLargeObjects() throws Exception
     {
         StringBuilder nameBuf = new StringBuilder("longString");
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/UnicodeHandlingTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/UnicodeHandlingTest.java
index 08a16c865..7e02352f3 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/UnicodeHandlingTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/UnicodeHandlingTest.java
@@ -2,16 +2,20 @@
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
-import com.fasterxml.jackson.dataformat.smile.SmileFactory;
-import com.fasterxml.jackson.dataformat.smile.SmileParser;
+import com.fasterxml.jackson.dataformat.smile.*;
 import com.fasterxml.jackson.dataformat.smile.testutil.ThrottledInputStream;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class UnicodeHandlingTest extends BaseTestForSmile
 {
     private final SmileFactory F = smileFactory(false, true, false);
 
+    @Test
     public void testShortUnicodeWithSurrogates() throws IOException
     {
         _testLongUnicodeWithSurrogates(28, false);
@@ -20,6 +24,7 @@ public void testShortUnicodeWithSurrogates() throws IOException
         _testLongUnicodeWithSurrogates(230, false);
     }
 
+    @Test
     public void testLongUnicodeWithSurrogates() throws IOException
     {
         _testLongUnicodeWithSurrogates(700, false);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/dos/DeepNestingSmileParserTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/dos/DeepNestingSmileParserTest.java
index 5dadfa698..1728f194a 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/dos/DeepNestingSmileParserTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/parse/dos/DeepNestingSmileParserTest.java
@@ -3,17 +3,21 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamConstraintsException;
-
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Unit tests for deeply nested JSON
  */
 public class DeepNestingSmileParserTest extends BaseTestForSmile
 {
+    @Test
     public void testDeeplyNestedObjects() throws Exception
     {
         final int depth = 1500;
@@ -27,11 +31,12 @@ public void testDeeplyNestedObjects() throws Exception
         } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamReadConstraints.DEFAULT_MAX_DEPTH + 1);
-            assertTrue("StreamConstraintsException message is as expected?",
-                    e.getMessage().startsWith(exceptionPrefix));
+            assertTrue(e.getMessage().startsWith(exceptionPrefix),
+                    "StreamConstraintsException message is as expected?");
         }
     }
 
+    @Test
     public void testDeeplyNestedObjectsWithUnconstrainedMapper() throws Exception
     {
         final int depth = 1500;
@@ -47,6 +52,7 @@ public void testDeeplyNestedObjectsWithUnconstrainedMapper() throws Exception
         }
     }
 
+    @Test
     public void testDeeplyNestedArrays() throws Exception
     {
         final int depth = 750;
@@ -60,11 +66,12 @@ public void testDeeplyNestedArrays() throws Exception
         } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamReadConstraints.DEFAULT_MAX_DEPTH + 1);
-            assertTrue("StreamConstraintsException message is as expected?",
-                    e.getMessage().startsWith(exceptionPrefix));
+            assertTrue(e.getMessage().startsWith(exceptionPrefix),
+                    "StreamConstraintsException message is as expected?");
         }
     }
 
+    @Test
     public void testDeeplyNestedArraysWithUnconstrainedMapper() throws Exception
     {
         final int depth = 750;
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/ReadTreesTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/ReadTreesTest.java
index 019adf9a9..567fab754 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/ReadTreesTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/ReadTreesTest.java
@@ -2,10 +2,13 @@
 
 import java.util.List;
 
-import com.fasterxml.jackson.databind.*;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ReadTreesTest extends BaseTestForSmile
 {
     private final ObjectMapper MAPPER = smileMapper();
@@ -20,6 +23,7 @@ static class IdValue {
     /**********************************************************
      */
 
+    @Test
     public void testReadTreeSequence() throws Exception {
         _testReadTreeSequence(true);
         _testReadTreeSequence(false);
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/SequenceWriterTest.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/SequenceWriterTest.java
index 94166326a..3f2396aaa 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/SequenceWriterTest.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/seq/SequenceWriterTest.java
@@ -2,14 +2,13 @@
 
 import java.io.ByteArrayOutputStream;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MappingIterator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SequenceWriter;
+import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
 
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class SequenceWriterTest extends BaseTestForSmile
 {
@@ -31,6 +30,7 @@ public IdValue(int id, int value) {
     /**********************************************************
      */
 
+    @Test
     public void testSimpleSeqWrite() throws Exception
     {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java
index d1f47d5f0..4d0bff1a7 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java
@@ -1,15 +1,12 @@
 package com.fasterxml.jackson.dataformat.smile.testutil;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.SequenceInputStream;
-import java.io.StringReader;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.InputDecorator;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("serial")
 public class PrefixInputDecorator extends InputDecorator
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java
index 5f409eb53..76d2948ff 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java
@@ -1,12 +1,11 @@
 package com.fasterxml.jackson.dataformat.smile.testutil;
 
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
+import java.io.*;
 
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.OutputDecorator;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("serial")
 public class PrefixOutputDecorator extends OutputDecorator
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/ThrottledInputStream.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/ThrottledInputStream.java
index 77286a481..2f9065c5b 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/ThrottledInputStream.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/ThrottledInputStream.java
@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.smile.testutil;
 
-import java.io.ByteArrayInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
 public class ThrottledInputStream extends FilterInputStream
 {
diff --git a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/failure/JacksonTestFailureExpected.java b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/failure/JacksonTestFailureExpected.java
index 3457afd66..09a374dab 100644
--- a/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/failure/JacksonTestFailureExpected.java
+++ b/smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/failure/JacksonTestFailureExpected.java
@@ -21,11 +21,9 @@
  *
  *     &#64;Test
  *     &#64;JacksonTestFailureExpected
- *     @Test
-    public void testFeatureNotYetImplemented() {
+ *.    public void testFeatureNotYetImplemented() {
  *         // Test code that is expected to fail
  *     }
- * }
  * </code></pre>
  *
  * <p>
diff --git a/smile/src/test/java/perf/ReadPerfUntyped.java b/smile/src/test/java/perf/ReadPerfUntyped.java
index ce1b8bf5e..d2210392f 100644
--- a/smile/src/test/java/perf/ReadPerfUntyped.java
+++ b/smile/src/test/java/perf/ReadPerfUntyped.java
@@ -2,8 +2,8 @@
 
 import java.util.Map;
 
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.smile.SmileFactory;
 
 public class ReadPerfUntyped extends ReaderTestBase
diff --git a/smile/src/test/java/perf/ReaderTestBase.java b/smile/src/test/java/perf/ReaderTestBase.java
index b59ef96ca..6d4fe8d24 100644
--- a/smile/src/test/java/perf/ReaderTestBase.java
+++ b/smile/src/test/java/perf/ReaderTestBase.java
@@ -2,10 +2,9 @@
 
 import java.io.*;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
 
 abstract class ReaderTestBase
 {