diff --git a/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java b/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
index 69df0883a1..1bdd730b8c 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
+++ b/src/main/java/com/fasterxml/jackson/core/JsonGenerator.java
@@ -10,6 +10,7 @@
 
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.type.WritableTypeId;
 import com.fasterxml.jackson.core.type.WritableTypeId.Inclusion;
 import com.fasterxml.jackson.core.util.VersionUtil;
diff --git a/src/main/java/com/fasterxml/jackson/core/JsonParser.java b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
index 49ea2cf64d..319a9fb7f8 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
@@ -10,6 +10,7 @@
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.core.async.NonBlockingInputFeeder;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.sym.FieldNameMatcher;
 import com.fasterxml.jackson.core.type.ResolvedType;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -524,7 +525,7 @@ public NonBlockingInputFeeder getNonBlockingInputFeeder() {
      * {@link Feature#AUTO_CLOSE_SOURCE} is enabled.
      * Whether parser owns the input source depends on factory
      * method that was used to construct instance (so check
-     * {@link com.fasterxml.jackson.core.JsonFactory} for details,
+     * {@link com.fasterxml.jackson.core.json.JsonFactory} for details,
      * but the general
      * idea is that if caller passes in closable resource (such
      * as {@link InputStream} or {@link Reader}) parser does NOT
diff --git a/src/main/java/com/fasterxml/jackson/core/TokenStreamFactory.java b/src/main/java/com/fasterxml/jackson/core/TokenStreamFactory.java
index 3dff7d82ce..ec54c433e0 100644
--- a/src/main/java/com/fasterxml/jackson/core/TokenStreamFactory.java
+++ b/src/main/java/com/fasterxml/jackson/core/TokenStreamFactory.java
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import com.fasterxml.jackson.core.io.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.sym.FieldNameMatcher;
 import com.fasterxml.jackson.core.sym.SimpleNameMatcher;
 import com.fasterxml.jackson.core.util.BufferRecycler;
@@ -137,6 +138,139 @@ public static int collectDefaults() {
         public int getMask() { return (1 << ordinal()); }
     }
 
+    /**
+     * Since factory instances are immutable, a Builder class is needed for creating
+     * configurations for differently configured factory instances.
+     *
+     * @since 3.0
+     */
+    public abstract static class TSFBuilder<F extends TokenStreamFactory,
+        T extends TSFBuilder<F,T>>
+    {
+        /**
+         * Set of {@link TokenStreamFactory.Feature}s enabled, as bitmask.
+         */
+        protected int _factoryFeatures;
+
+        /**
+         * Set of {@link JsonParser.Feature}s enabled, as bitmask.
+         */
+        protected int _parserFeatures;
+
+        /**
+         * Set of {@link JsonGenerator.Feature}s enabled, as bitmask.
+         */
+        protected int _generatorFeatures;
+
+        // // // Construction
+
+        protected TSFBuilder() {
+            _factoryFeatures = DEFAULT_FACTORY_FEATURE_FLAGS;
+            _parserFeatures = DEFAULT_PARSER_FEATURE_FLAGS;
+            _generatorFeatures = DEFAULT_GENERATOR_FEATURE_FLAGS;
+        }
+
+        protected TSFBuilder(TokenStreamFactory base)
+        {
+            this(base._factoryFeatures,
+                    base.getParserFeatures(), base.getGeneratorFeatures());
+        }
+
+        protected TSFBuilder(int factoryFeatures,
+                int parserFeatures, int generatorFeatures)
+        {
+            _factoryFeatures = factoryFeatures;
+            _parserFeatures = parserFeatures;
+            _generatorFeatures = generatorFeatures;
+        }
+
+        // // // Accessors
+
+        public int factoryFeaturesMask() { return _factoryFeatures; }
+        public int parserFeaturesMask() { return _parserFeatures; }
+        public int generatorFeaturesMask() { return _generatorFeatures; }
+
+        // // // Factory features
+
+        public T with(TokenStreamFactory.Feature f) {
+            _factoryFeatures |= f.getMask();
+            return _this();
+        }
+
+        public T without(TokenStreamFactory.Feature f) {
+            _factoryFeatures &= ~f.getMask();
+            return _this();
+        }
+
+        // // // Parser features
+
+        public T with(JsonParser.Feature f) {
+            _parserFeatures |= f.getMask();
+            return _this();
+        }
+
+        public T with(JsonParser.Feature first, JsonParser.Feature... other) {
+            _parserFeatures |= first.getMask();
+            for (JsonParser.Feature f : other) {
+                _parserFeatures |= f.getMask();
+            }
+            return _this();
+        }
+
+        public T without(JsonParser.Feature f) {
+            _parserFeatures &= ~f.getMask();
+            return _this();
+        }
+
+        public T without(JsonParser.Feature first, JsonParser.Feature... other) {
+            _parserFeatures &= ~first.getMask();
+            for (JsonParser.Feature f : other) {
+                _parserFeatures &= ~f.getMask();
+            }
+            return _this();
+        }
+
+        // // // Generator features
+
+        public T with(JsonGenerator.Feature f) {
+            _generatorFeatures |= f.getMask();
+            return _this();
+        }
+
+        public T with(JsonGenerator.Feature first, JsonGenerator.Feature... other) {
+            _generatorFeatures |= first.getMask();
+            for (JsonGenerator.Feature f : other) {
+                _parserFeatures |= f.getMask();
+            }
+            return _this();
+        }
+
+        public T without(JsonGenerator.Feature f) {
+            _generatorFeatures &= ~f.getMask();
+            return _this();
+        }
+        
+        public T without(JsonGenerator.Feature first, JsonGenerator.Feature... other) {
+            _generatorFeatures &= ~first.getMask();
+            for (JsonGenerator.Feature f : other) {
+                _generatorFeatures &= ~f.getMask();
+            }
+            return _this();
+        }
+
+        // // // Other methods
+
+        /**
+         * Method for constructing actual {@link TokenStreamFactory} instance, given
+         * configuration.
+         */
+        protected abstract F build();
+
+        // silly convenience cast method we need
+        @SuppressWarnings("unchecked")
+        protected final T _this() { return (T) this; }
+    }
+
     /*
     /**********************************************************
     /* Constants
@@ -199,6 +333,22 @@ public static int collectDefaults() {
      */
     public TokenStreamFactory() { }
 
+    /**
+     * Constructors used by {@link TSFBuilder} for instantiation. Base builder is
+     * passed as-is to try to make interface between base types and implementations
+     * less likely to change (given that sub-classing is a fragile way to do it):
+     * if and when new general-purpose properties are added, implementation classes
+     * do not have to use different constructors.
+     *
+     * @since 3.0
+     */
+    protected TokenStreamFactory(TSFBuilder<?,?> baseBuilder)
+    {
+        _factoryFeatures = baseBuilder.factoryFeaturesMask();
+        _parserFeatures = baseBuilder.parserFeaturesMask();
+        _generatorFeatures = baseBuilder.generatorFeaturesMask();
+    }
+
     /**
      * Constructor used when copy()ing a factory instance.
      */
@@ -217,6 +367,14 @@ protected TokenStreamFactory(TokenStreamFactory src)
      */
     public abstract TokenStreamFactory copy();
 
+    /**
+     * Method that can be used to create differently configured stream factories.
+     *
+     * @since 3.0
+     */
+    public abstract TSFBuilder<?,?> rebuild();
+//    public abstract <F extends TokenStreamFactory, T extends TSFBuilder<F,T>> TSFBuilder<F,T> rebuild();
+
     /*
     /**********************************************************
     /* Capability introspection
@@ -600,46 +758,73 @@ public abstract JsonParser createParser(ObjectReadContext readCtxt,
     /**********************************************************
      */
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,java.io.File)}
+     */
     @Deprecated
     public JsonParser createParser(File src) throws IOException {
         return createParser(ObjectReadContext.empty(), src);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,java.net.URL)}
+     */
     @Deprecated
     public JsonParser createParser(URL src) throws IOException {
         return createParser(ObjectReadContext.empty(), src);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,java.io.InputStream)}
+     */
     @Deprecated
     public JsonParser createParser(InputStream in) throws IOException {
         return createParser(ObjectReadContext.empty(), in);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,java.io.Reader)}
+     */
     @Deprecated
     public JsonParser createParser(Reader r) throws IOException {
         return createParser(ObjectReadContext.empty(), r);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,byte[])}
+     */
     @Deprecated
     public JsonParser createParser(byte[] data) throws IOException {
         return createParser(ObjectReadContext.empty(), data, 0, data.length);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,byte[],int,int)}
+     */
     @Deprecated
     public JsonParser createParser(byte[] data, int offset, int len) throws IOException {
         return createParser(ObjectReadContext.empty(), data, offset, len);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,String)}
+     */
     @Deprecated
     public JsonParser createParser(String content) throws IOException {
         return createParser(ObjectReadContext.empty(), content);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,char[])}
+     */
     @Deprecated
     public JsonParser createParser(char[] content) throws IOException {
         return createParser(ObjectReadContext.empty(), content, 0, content.length);
     }
 
+    /**
+     * @deprecated Since 3.0 use {@link #createParser(ObjectReadContext,char[],int,int)}
+     */
     @Deprecated
     public JsonParser createParser(char[] content, int offset, int len) throws IOException {
         return createParser(ObjectReadContext.empty(), content, offset, len);
diff --git a/src/main/java/com/fasterxml/jackson/core/async/package-info.java b/src/main/java/com/fasterxml/jackson/core/async/package-info.java
index c7d2782fa7..a0d1775d32 100644
--- a/src/main/java/com/fasterxml/jackson/core/async/package-info.java
+++ b/src/main/java/com/fasterxml/jackson/core/async/package-info.java
@@ -2,7 +2,7 @@
  * Package that contains abstractions needed to support optional
  * non-blocking decoding (parsing) functionality.
  * Although parsers are constructed normally via
- * {@link com.fasterxml.jackson.core.JsonFactory}
+ * {@link com.fasterxml.jackson.core.json.JsonFactory}
  * (and are, in fact, sub-types of {@link com.fasterxml.jackson.core.JsonParser}),
  * the way input is provided differs.
  *
diff --git a/src/main/java/com/fasterxml/jackson/core/base/BinaryTSFactory.java b/src/main/java/com/fasterxml/jackson/core/base/BinaryTSFactory.java
index e9662198ca..0878c1c465 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/BinaryTSFactory.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/BinaryTSFactory.java
@@ -21,6 +21,16 @@ public abstract class BinaryTSFactory extends DecorableTSFactory
 
     protected BinaryTSFactory() { super(); }
 
+    /**
+     * Constructors used by builders for instantiation.
+     *
+     * @since 3.0
+     */
+    protected BinaryTSFactory(DecorableTSFBuilder<?,?> baseBuilder)
+    {
+        super(baseBuilder);
+    }
+
     /**
      * Constructor used when copy()ing a factory instance.
      */
diff --git a/src/main/java/com/fasterxml/jackson/core/base/DecorableTSFactory.java b/src/main/java/com/fasterxml/jackson/core/base/DecorableTSFactory.java
index 1584335b06..924cc3bd36 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/DecorableTSFactory.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/DecorableTSFactory.java
@@ -14,6 +14,60 @@
 public abstract class DecorableTSFactory
     extends TokenStreamFactory
 {
+    /**
+     * Since factory instances are immutable, a Builder class is needed for creating
+     * configurations for differently configured factory instances.
+     *
+     * @since 3.0
+     */
+    public abstract static class DecorableTSFBuilder<F extends TokenStreamFactory,
+        T extends TSFBuilder<F,T>>
+        extends TSFBuilder<F,T>
+    {
+        /**
+         * Optional helper object that may decorate input sources, to do
+         * additional processing on input during parsing.
+         */
+        protected InputDecorator _inputDecorator;
+
+        /**
+         * Optional helper object that may decorate output object, to do
+         * additional processing on output during content generation.
+         */
+        protected OutputDecorator _outputDecorator;
+
+        // // // Construction
+
+        protected DecorableTSFBuilder() {
+            super();
+            _inputDecorator = null;
+            _outputDecorator = null;
+        }
+
+        protected DecorableTSFBuilder(DecorableTSFactory base)
+        {
+            super(base);
+            _inputDecorator = base.getInputDecorator();
+            _outputDecorator = base.getOutputDecorator();
+        }
+
+        // // // Accessors
+        public InputDecorator inputDecorator() { return _inputDecorator; }
+        public OutputDecorator outputDecorator() { return _outputDecorator; }
+
+        // // // Decorators
+
+        public T inputDecorator(InputDecorator dec) {
+            _inputDecorator = dec;
+            return _this();
+        }
+
+        public T outputDecorator(OutputDecorator dec) {
+            _outputDecorator = dec;
+            return _this();
+        }
+    }
+
     /*
     /**********************************************************
     /* Configuration
@@ -40,11 +94,25 @@ public abstract class DecorableTSFactory
     
     protected DecorableTSFactory() { }
 
+    /**
+     * Constructors used by builders for instantiation.
+     *
+     * @since 3.0
+     */
+    protected DecorableTSFactory(DecorableTSFBuilder<?,?> baseBuilder)
+    {
+        super(baseBuilder);
+        _inputDecorator = baseBuilder.inputDecorator();
+        _outputDecorator = baseBuilder.outputDecorator();
+    }
+
     /**
      * Constructor used when copy()ing a factory instance.
      */
     protected DecorableTSFactory(DecorableTSFactory src) {
         super(src);
+        _inputDecorator = src.getInputDecorator();
+        _outputDecorator = src.getOutputDecorator();
     }
 
     /*
@@ -57,6 +125,7 @@ public OutputDecorator getOutputDecorator() {
         return _outputDecorator;
     }
 
+    @Deprecated // since 3.0
     public DecorableTSFactory setOutputDecorator(OutputDecorator d) {
         _outputDecorator = d;
         return this;
@@ -66,6 +135,7 @@ public InputDecorator getInputDecorator() {
         return _inputDecorator;
     }
 
+    @Deprecated // since 3.0
     public DecorableTSFactory setInputDecorator(InputDecorator d) {
         _inputDecorator = d;
         return this;
diff --git a/src/main/java/com/fasterxml/jackson/core/base/TextualTSFactory.java b/src/main/java/com/fasterxml/jackson/core/base/TextualTSFactory.java
index 86186900fb..3d201f7627 100644
--- a/src/main/java/com/fasterxml/jackson/core/base/TextualTSFactory.java
+++ b/src/main/java/com/fasterxml/jackson/core/base/TextualTSFactory.java
@@ -23,6 +23,16 @@ public abstract class TextualTSFactory extends DecorableTSFactory
     
     protected TextualTSFactory() { super(); }
 
+    /**
+     * Constructors used by builders for instantiation.
+     *
+     * @since 3.0
+     */
+    protected TextualTSFactory(DecorableTSFBuilder<?,?> baseBuilder)
+    {
+        super(baseBuilder);
+    }
+
     /**
      * Constructor used when copy()ing a factory instance.
      */
diff --git a/src/main/java/com/fasterxml/jackson/core/io/InputDecorator.java b/src/main/java/com/fasterxml/jackson/core/io/InputDecorator.java
index eb98a8c73f..7b0d989ea4 100644
--- a/src/main/java/com/fasterxml/jackson/core/io/InputDecorator.java
+++ b/src/main/java/com/fasterxml/jackson/core/io/InputDecorator.java
@@ -14,7 +14,7 @@ public abstract class InputDecorator
     private static final long serialVersionUID = 1L;
     
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating parser given an {@link InputStream}, when this decorator
      * has been registered.
      * 
@@ -31,7 +31,7 @@ public abstract InputStream decorate(IOContext ctxt, InputStream in)
         throws IOException;
 
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating parser on given "raw" byte source.
      * Method can either construct a {@link InputStream} for reading; or return
      * null to indicate that no wrapping should occur.
@@ -51,7 +51,7 @@ public abstract InputStream decorate(IOContext ctxt, byte[] src, int offset, int
         throws IOException;
 
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating parser given an {@link DataInput}, when this decorator
      * has been registered.
      *<p>
@@ -74,7 +74,7 @@ public DataInput decorate(IOContext ctxt, DataInput input)
     }
 
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating parser given an {@link Reader}, when this decorator
      * has been registered.
      * 
diff --git a/src/main/java/com/fasterxml/jackson/core/io/OutputDecorator.java b/src/main/java/com/fasterxml/jackson/core/io/OutputDecorator.java
index d9df3ba675..9ef597513c 100644
--- a/src/main/java/com/fasterxml/jackson/core/io/OutputDecorator.java
+++ b/src/main/java/com/fasterxml/jackson/core/io/OutputDecorator.java
@@ -12,7 +12,7 @@
 public abstract class OutputDecorator implements java.io.Serializable // since 2.1
 {
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating generator for given {@link OutputStream}, when this decorator
      * has been registered.
      * 
@@ -25,7 +25,7 @@ public abstract class OutputDecorator implements java.io.Serializable // since 2
     public abstract OutputStream decorate(IOContext ctxt, OutputStream out) throws IOException;
 
     /**
-     * Method called by {@link com.fasterxml.jackson.core.JsonFactory} instance when
+     * Method called by {@link com.fasterxml.jackson.core.json.JsonFactory} instance when
      * creating generator for given {@link Writer}, when this decorator
      * has been registered.
      * 
diff --git a/src/main/java/com/fasterxml/jackson/core/JsonFactory.java b/src/main/java/com/fasterxml/jackson/core/json/JsonFactory.java
similarity index 94%
rename from src/main/java/com/fasterxml/jackson/core/JsonFactory.java
rename to src/main/java/com/fasterxml/jackson/core/json/JsonFactory.java
index 025ca99f34..883b6321ff 100644
--- a/src/main/java/com/fasterxml/jackson/core/JsonFactory.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/JsonFactory.java
@@ -2,14 +2,14 @@
  *
  * Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
  */
-package com.fasterxml.jackson.core;
+package com.fasterxml.jackson.core.json;
 
 import java.io.*;
 import java.util.List;
 
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.base.TextualTSFactory;
 import com.fasterxml.jackson.core.io.*;
-import com.fasterxml.jackson.core.json.*;
 import com.fasterxml.jackson.core.json.async.NonBlockingJsonParser;
 import com.fasterxml.jackson.core.sym.BinaryNameMatcher;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
@@ -22,6 +22,10 @@
  * JSON-backed {@link TokenStreamFactory} implementation that will create
  * token readers ("parsers") and writers ("generators") for handling
  * JSON-encoded content.
+ *<p>
+ * Note that this class used to reside at main <code>com.fasterxml.jackson.core</code>
+ * in 2.x, but moved here to denote its changed role as implementation, not base
+ * class for factories.
  */
 public class JsonFactory
     extends TextualTSFactory
@@ -112,6 +116,29 @@ protected JsonFactory(JsonFactory src)
         _rootValueSeparator = src._rootValueSeparator;
     }
 
+    /**
+     * Constructors used by {@link JsonFactoryBuilder} for instantiation.
+     *
+     * @since 3.0
+     */
+    protected JsonFactory(JsonFactoryBuilder b)
+    {
+        super(b);
+    }
+
+    @Override
+    public JsonFactoryBuilder rebuild() {
+        return new JsonFactoryBuilder(this);
+    }
+
+    /**
+     * Main factory method to use for constructing {@link JsonFactory} instances with
+     * different configuration.
+     */
+    public static JsonFactoryBuilder builder() {
+        return new JsonFactoryBuilder();
+    }
+
     /**
      * Method for constructing a new {@link JsonFactory} that has
      * the same settings as this instance, but is otherwise
diff --git a/src/main/java/com/fasterxml/jackson/core/json/JsonFactoryBuilder.java b/src/main/java/com/fasterxml/jackson/core/json/JsonFactoryBuilder.java
new file mode 100644
index 0000000000..d5dd986acf
--- /dev/null
+++ b/src/main/java/com/fasterxml/jackson/core/json/JsonFactoryBuilder.java
@@ -0,0 +1,28 @@
+package com.fasterxml.jackson.core.json;
+
+import com.fasterxml.jackson.core.base.DecorableTSFactory.DecorableTSFBuilder;
+
+/**
+ * {@link com.fasterxml.jackson.core.TokenStreamFactory.TSFBuilder}
+ * implementation for constructing {@link JsonFactory}
+ * instances.
+ *
+ * @since 3.0
+ */
+public class JsonFactoryBuilder extends DecorableTSFBuilder<JsonFactory, JsonFactoryBuilder>
+{
+    public JsonFactoryBuilder() {
+        super();
+    }
+
+    public JsonFactoryBuilder(JsonFactory base) {
+        super(base);
+    }
+
+    @Override
+    protected JsonFactory build() {
+        // 28-Dec-2017, tatu: No special settings beyond base class ones, so:
+        return new JsonFactory(this);
+    }
+
+}
diff --git a/src/main/java/com/fasterxml/jackson/core/package-info.java b/src/main/java/com/fasterxml/jackson/core/package-info.java
index a77e88166a..135bac9b3b 100644
--- a/src/main/java/com/fasterxml/jackson/core/package-info.java
+++ b/src/main/java/com/fasterxml/jackson/core/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Main public API classes of the core streaming JSON
- * processor: most importantly {@link com.fasterxml.jackson.core.JsonFactory}
+ * processor: most importantly {@link com.fasterxml.jackson.core.json.JsonFactory}
  * used for constructing
  * JSON parser ({@link com.fasterxml.jackson.core.JsonParser})
  * and generator
diff --git a/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.java b/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.java
index 2b40ba73ca..7577ed4dd0 100644
--- a/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.java
+++ b/src/main/java/com/fasterxml/jackson/core/sym/ByteQuadsCanonicalizer.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.util.InternCache;
 
 /**
diff --git a/src/main/java/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java b/src/main/java/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java
index d29587ff05..89556ad1b9 100644
--- a/src/main/java/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java
+++ b/src/main/java/com/fasterxml/jackson/core/sym/CharsToNameCanonicalizer.java
@@ -4,7 +4,7 @@
 import java.util.BitSet;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.util.InternCache;
 
 /**
@@ -276,7 +276,7 @@ private CharsToNameCanonicalizer(CharsToNameCanonicalizer parent, int flags, int
      */
 
     /**
-     * Method called to create root canonicalizer for a {@link com.fasterxml.jackson.core.JsonFactory}
+     * Method called to create root canonicalizer for a {@link com.fasterxml.jackson.core.json.JsonFactory}
      * instance. Root instance is never used directly; its main use is for
      * storing and sharing underlying symbol arrays as needed.
      */
diff --git a/src/test/java/com/fasterxml/jackson/core/BaseTest.java b/src/test/java/com/fasterxml/jackson/core/BaseTest.java
index 1abfca14bf..575da5932a 100644
--- a/src/test/java/com/fasterxml/jackson/core/BaseTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/BaseTest.java
@@ -3,6 +3,7 @@
 import java.io.*;
 import java.util.*;
 
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.MockDataInput;
 import com.fasterxml.jackson.core.testsupport.ThrottledInputStream;
 import com.fasterxml.jackson.core.util.Named;
diff --git a/src/test/java/com/fasterxml/jackson/core/PointerFromContextTest.java b/src/test/java/com/fasterxml/jackson/core/PointerFromContextTest.java
index 6f283665d3..022e3e3246 100644
--- a/src/test/java/com/fasterxml/jackson/core/PointerFromContextTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/PointerFromContextTest.java
@@ -2,6 +2,8 @@
 
 import java.io.StringWriter;
 
+import com.fasterxml.jackson.core.json.JsonFactory;
+
 public class PointerFromContextTest extends BaseTest
 {
     /*
diff --git a/src/test/java/com/fasterxml/jackson/core/TestExceptions.java b/src/test/java/com/fasterxml/jackson/core/TestExceptions.java
index c180ec1076..03b653f433 100644
--- a/src/test/java/com/fasterxml/jackson/core/TestExceptions.java
+++ b/src/test/java/com/fasterxml/jackson/core/TestExceptions.java
@@ -3,6 +3,7 @@
 import java.io.StringWriter;
 
 import com.fasterxml.jackson.core.io.JsonEOFException;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class TestExceptions extends BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/core/TestJDKSerializability.java b/src/test/java/com/fasterxml/jackson/core/TestJDKSerializability.java
index c6958e7007..eae58b442d 100644
--- a/src/test/java/com/fasterxml/jackson/core/TestJDKSerializability.java
+++ b/src/test/java/com/fasterxml/jackson/core/TestJDKSerializability.java
@@ -4,10 +4,10 @@
 
 import com.fasterxml.jackson.core.Base64Variant;
 import com.fasterxml.jackson.core.Base64Variants;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.PrettyPrinter;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/core/TestLocation.java b/src/test/java/com/fasterxml/jackson/core/TestLocation.java
index 8a49225574..df66bbc0b6 100644
--- a/src/test/java/com/fasterxml/jackson/core/TestLocation.java
+++ b/src/test/java/com/fasterxml/jackson/core/TestLocation.java
@@ -3,6 +3,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
+import com.fasterxml.jackson.core.json.JsonFactory;
+
 public class TestLocation extends BaseTest
 {
     static class Foobar { }
diff --git a/src/test/java/com/fasterxml/jackson/core/async/AsyncTestBase.java b/src/test/java/com/fasterxml/jackson/core/async/AsyncTestBase.java
index efe8a494af..682bb2aa89 100644
--- a/src/test/java/com/fasterxml/jackson/core/async/AsyncTestBase.java
+++ b/src/test/java/com/fasterxml/jackson/core/async/AsyncTestBase.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapperForByteArray;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/base64/Base64BinaryParsingTest.java b/src/test/java/com/fasterxml/jackson/core/base64/Base64BinaryParsingTest.java
index c20138fcd6..8c793a2b34 100644
--- a/src/test/java/com/fasterxml/jackson/core/base64/Base64BinaryParsingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/base64/Base64BinaryParsingTest.java
@@ -5,6 +5,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class Base64BinaryParsingTest
     extends com.fasterxml.jackson.core.BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/base64/Base64GenerationTest.java b/src/test/java/com/fasterxml/jackson/core/base64/Base64GenerationTest.java
index 8fccdf4129..9325927e8c 100644
--- a/src/test/java/com/fasterxml/jackson/core/base64/Base64GenerationTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/base64/Base64GenerationTest.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.ThrottledInputStream;
 
 public class Base64GenerationTest
diff --git a/src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java b/src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java
index fc2ef742d9..8cd95b2b8e 100644
--- a/src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Low-level tests for explicit, hand-written tests for generator-side
diff --git a/src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java b/src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java
index e38ae4e919..7e82600b77 100644
--- a/src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java
@@ -3,6 +3,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 @SuppressWarnings("resource")
 public class BasicParserFilteringTest extends BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerGeneratorFilteringTest.java b/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerGeneratorFilteringTest.java
index edc4b4df70..4193e58476 100644
--- a/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerGeneratorFilteringTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerGeneratorFilteringTest.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 @SuppressWarnings("resource")
 public class JsonPointerGeneratorFilteringTest extends com.fasterxml.jackson.core.BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerParserFilteringTest.java b/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerParserFilteringTest.java
index 6e86147e29..011c15894d 100644
--- a/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerParserFilteringTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/filter/JsonPointerParserFilteringTest.java
@@ -3,6 +3,7 @@
 import java.io.StringWriter;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class JsonPointerParserFilteringTest extends com.fasterxml.jackson.core.BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/core/io/TestJsonStringEncoder.java b/src/test/java/com/fasterxml/jackson/core/io/TestJsonStringEncoder.java
index 61e6fe6688..e2b31a88c7 100644
--- a/src/test/java/com/fasterxml/jackson/core/io/TestJsonStringEncoder.java
+++ b/src/test/java/com/fasterxml/jackson/core/io/TestJsonStringEncoder.java
@@ -6,6 +6,7 @@
 import static org.junit.Assert.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.util.BufferRecyclers;
 
 public class TestJsonStringEncoder
diff --git a/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailFromReaderTest.java b/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailFromReaderTest.java
index 93e28085a4..a56d512e35 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailFromReaderTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailFromReaderTest.java
@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.core.json;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectWriteContext;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailTest.java b/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailTest.java
index 31084fa335..6052f42fa7 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/GeneratorFailTest.java
@@ -4,7 +4,6 @@
 import java.io.OutputStreamWriter;
 
 import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.ObjectWriteContext;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/RawValueWithSurrogatesTest.java b/src/test/java/com/fasterxml/jackson/core/json/RawValueWithSurrogatesTest.java
index f5d7692c50..5251522e28 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/RawValueWithSurrogatesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/RawValueWithSurrogatesTest.java
@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.core.json;
 
 import java.io.ByteArrayOutputStream;
-import com.fasterxml.jackson.core.JsonFactory;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.ObjectWriteContext;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/json/TestDecorators.java b/src/test/java/com/fasterxml/jackson/core/json/TestDecorators.java
index 5157bbd7c1..61cf627cfd 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/TestDecorators.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/TestDecorators.java
@@ -71,8 +71,9 @@ public Writer decorate(IOContext ctxt, Writer w) throws IOException
 
     public void testInputDecoration() throws IOException
     {
-        JsonFactory f = new JsonFactory();
-        f.setInputDecorator(new SimpleInputDecorator());
+        JsonFactory f = JsonFactory.builder()
+                .inputDecorator(new SimpleInputDecorator())
+                .build();
         JsonParser jp;
         // first test with Reader
         jp = f.createParser(ObjectReadContext.empty(), new StringReader("{ }"));
@@ -98,8 +99,9 @@ public void testInputDecoration() throws IOException
 
     public void testOutputDecoration() throws IOException
     {
-        JsonFactory f = new JsonFactory();
-        f.setOutputDecorator(new SimpleOutputDecorator());
+        JsonFactory f = JsonFactory.builder()
+                .outputDecorator(new SimpleOutputDecorator())
+                .build();
         JsonGenerator jg;
 
         StringWriter sw = new StringWriter();
diff --git a/src/test/java/com/fasterxml/jackson/core/json/TestParserOverrides.java b/src/test/java/com/fasterxml/jackson/core/json/TestParserOverrides.java
index 1c63279c26..d847022886 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/TestParserOverrides.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/TestParserOverrides.java
@@ -3,7 +3,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.ObjectReadContext;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/TestUtf8Generator.java b/src/test/java/com/fasterxml/jackson/core/json/TestUtf8Generator.java
index 0e4675ec86..5ce4397bf9 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/TestUtf8Generator.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/TestUtf8Generator.java
@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.core.json;
 
 import com.fasterxml.jackson.core.BaseTest;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncBinaryParseTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncBinaryParseTest.java
index 437067cf83..430492676a 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncBinaryParseTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncBinaryParseTest.java
@@ -6,6 +6,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncBinaryParseTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCharEscapingTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCharEscapingTest.java
index 9bb61a93a1..5783089d4c 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCharEscapingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCharEscapingTest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCommentParsingTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCommentParsingTest.java
index c24d1a13fd..5c7d952a02 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCommentParsingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncCommentParsingTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncFieldNamesTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncFieldNamesTest.java
index e3796bb227..c44030a2f1 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncFieldNamesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncFieldNamesTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncFieldNamesTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncInvalidCharsTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncInvalidCharsTest.java
index c52aa49121..352fcfa23a 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncInvalidCharsTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncInvalidCharsTest.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.core.async.AsyncTestBase;
-
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 // Tests for verifying things such as handling of invalid control characters;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInArrayTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInArrayTest.java
index f5e926207c..8402eb697a 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInArrayTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInArrayTest.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 import org.junit.Test;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInObjectTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInObjectTest.java
index 02b578ddb5..a9cce89ef7 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInObjectTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncMissingValuesInObjectTest.java
@@ -7,12 +7,12 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 @RunWith(Parameterized.class)
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdNumbersTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdNumbersTest.java
index 2623effc9f..ab93b6e55e 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdNumbersTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdNumbersTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncNonStdNumbersTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdParsingTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdParsingTest.java
index c49be6580c..ed7facddbf 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdParsingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNonStdParsingTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncNonStdParsingTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberCoercionTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberCoercionTest.java
index 6fe26937d0..50a4520f8c 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberCoercionTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberCoercionTest.java
@@ -4,10 +4,10 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 import com.fasterxml.jackson.core.JsonToken;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberLeadingZeroesTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberLeadingZeroesTest.java
index 768430e442..6538b28fb6 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberLeadingZeroesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncNumberLeadingZeroesTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncNumberLeadingZeroesTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncParserNamesTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncParserNamesTest.java
index 6d2e3655de..e3d3d2f344 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncParserNamesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncParserNamesTest.java
@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.json.async.NonBlockingJsonParserBase;
 import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootNumbersTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootNumbersTest.java
index 6cd43f2c5f..f4569c4f75 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootNumbersTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootNumbersTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncRootNumbersTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootValuesTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootValuesTest.java
index 16b24c19ef..85305b65ed 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootValuesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncRootValuesTest.java
@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncRootValuesTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScalarArrayTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScalarArrayTest.java
index aa7a186bc2..6231f8f5f2 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScalarArrayTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScalarArrayTest.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncScalarArrayTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScopeMatchingTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScopeMatchingTest.java
index f4b1d4282c..df4be69b07 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScopeMatchingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncScopeMatchingTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleNestedTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleNestedTest.java
index 5922db0dfb..dfe736444f 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleNestedTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleNestedTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncSimpleNestedTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleObjectTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleObjectTest.java
index 91026b45ad..5f88cafa57 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleObjectTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncSimpleObjectTest.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncSimpleObjectTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringArrayTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringArrayTest.java
index 33473b898c..63ee6e0f9c 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringArrayTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringArrayTest.java
@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncStringArrayTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringObjectTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringObjectTest.java
index e9dd38b545..501b44f2ed 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringObjectTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncStringObjectTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncStringObjectTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncUnicodeHandlingTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncUnicodeHandlingTest.java
index 05915feaa8..8d2b586c9b 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/AsyncUnicodeHandlingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/AsyncUnicodeHandlingTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncUnicodeHandlingTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/json/async/ConfigTest.java b/src/test/java/com/fasterxml/jackson/core/json/async/ConfigTest.java
index 743a0e3f00..f424786e90 100644
--- a/src/test/java/com/fasterxml/jackson/core/json/async/ConfigTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/json/async/ConfigTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class ConfigTest extends AsyncTestBase
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestArrayParsing.java b/src/test/java/com/fasterxml/jackson/core/main/TestArrayParsing.java
index b189cb1fd1..c1c0c9872e 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestArrayParsing.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestArrayParsing.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.main;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Set of additional unit for verifying array parsing, specifically
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorArray.java b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorArray.java
index 99337c2bae..fd9427f9b2 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorArray.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorArray.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.main;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 import java.io.*;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorClosing.java b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorClosing.java
index c12cb4c353..e8b43694b1 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorClosing.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorClosing.java
@@ -2,6 +2,7 @@
 
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 import java.io.*;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorCopy.java b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorCopy.java
index 9a56198101..bdc0c14cad 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorCopy.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorCopy.java
@@ -2,6 +2,7 @@
 
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 import java.io.*;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorMisc.java b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorMisc.java
index 9e6b206f55..de91873f5a 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorMisc.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorMisc.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Set of basic unit tests for verifying basic generator
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorObject.java b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorObject.java
index 45dd4a7047..29c602cc13 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorObject.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestGeneratorObject.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.main;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 import java.io.*;
 import java.math.BigDecimal;
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestNumberParsing.java b/src/test/java/com/fasterxml/jackson/core/main/TestNumberParsing.java
index 6d480e6623..9bcfebc3d8 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestNumberParsing.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestNumberParsing.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.NumberInput;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Set of basic unit tests for verifying that the low-level number
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestParserClosing.java b/src/test/java/com/fasterxml/jackson/core/main/TestParserClosing.java
index c3fb2f9cf0..ef27a39b5d 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestParserClosing.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestParserClosing.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 import java.io.*;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestParserFeatures.java b/src/test/java/com/fasterxml/jackson/core/main/TestParserFeatures.java
index 97ad69f033..380a77b351 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestParserFeatures.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestParserFeatures.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Unit tests for verifying that additional <code>JsonParser.Feature</code>
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestParserWithObjects.java b/src/test/java/com/fasterxml/jackson/core/main/TestParserWithObjects.java
index 53923a4649..4cd865d961 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestParserWithObjects.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestParserWithObjects.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Unit tests for verifying that object mapping functionality can
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestPrettyPrinter.java b/src/test/java/com/fasterxml/jackson/core/main/TestPrettyPrinter.java
index c236dab4be..3eb16429c2 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestPrettyPrinter.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestPrettyPrinter.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.main;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
diff --git a/src/test/java/com/fasterxml/jackson/core/main/TestRawStringWriting.java b/src/test/java/com/fasterxml/jackson/core/main/TestRawStringWriting.java
index ffc2d768ba..76b136015f 100644
--- a/src/test/java/com/fasterxml/jackson/core/main/TestRawStringWriting.java
+++ b/src/test/java/com/fasterxml/jackson/core/main/TestRawStringWriting.java
@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class TestRawStringWriting extends com.fasterxml.jackson.core.BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/core/read/CommentParsingTest.java b/src/test/java/com/fasterxml/jackson/core/read/CommentParsingTest.java
index dce62c91c8..4af4f1f8e0 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/CommentParsingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/CommentParsingTest.java
@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Unit tests for verifying that support for (non-standard) comments
diff --git a/src/test/java/com/fasterxml/jackson/core/read/DataInputTest.java b/src/test/java/com/fasterxml/jackson/core/read/DataInputTest.java
index 4b90862581..1e501da9f7 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/DataInputTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/DataInputTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.read;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /* Additional testing for {@link java.io.DataInput} specific
  * challenges for parsing.
diff --git a/src/test/java/com/fasterxml/jackson/core/read/JsonParserTest.java b/src/test/java/com/fasterxml/jackson/core/read/JsonParserTest.java
index d854edbc03..24f17fb6e4 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/JsonParserTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/JsonParserTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.read;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.MockDataInput;
 import com.fasterxml.jackson.core.util.JsonParserDelegate;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/read/NextNameWithMatcherTest.java b/src/test/java/com/fasterxml/jackson/core/read/NextNameWithMatcherTest.java
index 70009b8636..315dfd589f 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/NextNameWithMatcherTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/NextNameWithMatcherTest.java
@@ -3,9 +3,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.sym.FieldNameMatcher;
 import com.fasterxml.jackson.core.util.Named;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/read/NonStandardParserFeaturesTest.java b/src/test/java/com/fasterxml/jackson/core/read/NonStandardParserFeaturesTest.java
index da0cffc391..6b8b61df5d 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/NonStandardParserFeaturesTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/NonStandardParserFeaturesTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.read;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class NonStandardParserFeaturesTest
     extends com.fasterxml.jackson.core.BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java b/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java
index c487159b59..3a9fd84e0d 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java
@@ -7,6 +7,7 @@
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Set of basic unit tests for verifying that the basic parser
diff --git a/src/test/java/com/fasterxml/jackson/core/read/ParserDupHandlingTest.java b/src/test/java/com/fasterxml/jackson/core/read/ParserDupHandlingTest.java
index 79dd355f9a..1665f9c7aa 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/ParserDupHandlingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/ParserDupHandlingTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.read;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class ParserDupHandlingTest
     extends com.fasterxml.jackson.core.BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/read/ParserSymbolHandlingTest.java b/src/test/java/com/fasterxml/jackson/core/read/ParserSymbolHandlingTest.java
index 42da6b8488..72f87e9a91 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/ParserSymbolHandlingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/ParserSymbolHandlingTest.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.core.read;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class ParserSymbolHandlingTest
     extends com.fasterxml.jackson.core.BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/read/TrailingCommasTest.java b/src/test/java/com/fasterxml/jackson/core/read/TrailingCommasTest.java
index daef53b448..c5c6782669 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/TrailingCommasTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/TrailingCommasTest.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.io.SerializedString;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.json.UTF8DataInputJsonParser;
 
 import org.junit.Test;
diff --git a/src/test/java/com/fasterxml/jackson/core/read/UTF32ParseTest.java b/src/test/java/com/fasterxml/jackson/core/read/UTF32ParseTest.java
index acd286cb11..8e46d52463 100644
--- a/src/test/java/com/fasterxml/jackson/core/read/UTF32ParseTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/read/UTF32ParseTest.java
@@ -3,6 +3,7 @@
 import java.io.CharConversionException;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 // Tests from [jackson-core#382]
 public class UTF32ParseTest extends BaseTest
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/SymbolTableMergingTest.java b/src/test/java/com/fasterxml/jackson/core/sym/SymbolTableMergingTest.java
index 330a5ab458..1e2b8f542b 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/SymbolTableMergingTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/SymbolTableMergingTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.json.ReaderBasedJsonParser;
 import com.fasterxml.jackson.core.json.UTF8StreamJsonParser;
 
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/SymbolsViaParserTest.java b/src/test/java/com/fasterxml/jackson/core/sym/SymbolsViaParserTest.java
index 2e344b8943..f70bc6a8e0 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/SymbolsViaParserTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/SymbolsViaParserTest.java
@@ -4,6 +4,7 @@
 import java.util.HashSet;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Tests that use symbol table functionality through parser.
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/TestByteBasedSymbols.java b/src/test/java/com/fasterxml/jackson/core/sym/TestByteBasedSymbols.java
index 6464f88d9e..b373fe3e63 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/TestByteBasedSymbols.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/TestByteBasedSymbols.java
@@ -4,6 +4,7 @@
 import java.lang.reflect.Field;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Unit test(s) to verify that handling of (byte-based) symbol tables
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/TestHashCollisionChars.java b/src/test/java/com/fasterxml/jackson/core/sym/TestHashCollisionChars.java
index 3f7f056797..476f637bd8 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/TestHashCollisionChars.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/TestHashCollisionChars.java
@@ -3,6 +3,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.sym.CharsToNameCanonicalizer;
 
 /**
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolTables.java b/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolTables.java
index 29bd150625..06edfcbfac 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolTables.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolTables.java
@@ -5,6 +5,7 @@
 import java.nio.charset.Charset;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Tests that directly modify/access underlying low-level symbol tables
diff --git a/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolsWithMediaItem.java b/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolsWithMediaItem.java
index 25920b4578..c039bd2414 100644
--- a/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolsWithMediaItem.java
+++ b/src/test/java/com/fasterxml/jackson/core/sym/TestSymbolsWithMediaItem.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class TestSymbolsWithMediaItem extends com.fasterxml.jackson.core.BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/core/util/RequestPayloadTest.java b/src/test/java/com/fasterxml/jackson/core/util/RequestPayloadTest.java
index aa9fed7d61..54033e6a4c 100644
--- a/src/test/java/com/fasterxml/jackson/core/util/RequestPayloadTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/util/RequestPayloadTest.java
@@ -9,7 +9,9 @@
  *
  * @see RequestPayload
  */
-public class RequestPayloadTest {
+@SuppressWarnings("unused")
+public class RequestPayloadTest
+{
   @Test(expected = IllegalArgumentException.class)
   public void testFailsToCreateTakingCharSequenceThrowsIllegalArgumentExceptionOne() {
       new RequestPayload(null);
diff --git a/src/test/java/com/fasterxml/jackson/core/util/TestDefaultPrettyPrinter.java b/src/test/java/com/fasterxml/jackson/core/util/TestDefaultPrettyPrinter.java
index 6a89f79eed..64202ea43f 100644
--- a/src/test/java/com/fasterxml/jackson/core/util/TestDefaultPrettyPrinter.java
+++ b/src/test/java/com/fasterxml/jackson/core/util/TestDefaultPrettyPrinter.java
@@ -5,6 +5,7 @@
 import java.io.StringWriter;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class TestDefaultPrettyPrinter extends BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java b/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java
index a0e00bb6c1..c2a5950892 100644
--- a/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java
+++ b/src/test/java/com/fasterxml/jackson/core/util/TestDelegates.java
@@ -5,6 +5,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.JsonParser.NumberType;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class TestDelegates extends com.fasterxml.jackson.core.BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/failing/Surrogate223Test.java b/src/test/java/com/fasterxml/jackson/failing/Surrogate223Test.java
index 24e5af2806..4ba4a962da 100644
--- a/src/test/java/com/fasterxml/jackson/failing/Surrogate223Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/Surrogate223Test.java
@@ -5,12 +5,12 @@
 import java.io.Writer;
 
 import com.fasterxml.jackson.core.BaseTest;
-import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.ObjectReadContext;
 import com.fasterxml.jackson.core.ObjectWriteContext;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class Surrogate223Test extends BaseTest
 {
diff --git a/src/test/java/com/fasterxml/jackson/failing/async/AsyncTokenErrorTest.java b/src/test/java/com/fasterxml/jackson/failing/async/AsyncTokenErrorTest.java
index 33316051bc..23731cf2d6 100644
--- a/src/test/java/com/fasterxml/jackson/failing/async/AsyncTokenErrorTest.java
+++ b/src/test/java/com/fasterxml/jackson/failing/async/AsyncTokenErrorTest.java
@@ -4,6 +4,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.async.AsyncTestBase;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;
 
 public class AsyncTokenErrorTest extends AsyncTestBase
diff --git a/src/test/java/perf/ConcurrencyReadTest.java b/src/test/java/perf/ConcurrencyReadTest.java
index 663714c131..6be05095a3 100644
--- a/src/test/java/perf/ConcurrencyReadTest.java
+++ b/src/test/java/perf/ConcurrencyReadTest.java
@@ -4,6 +4,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Manual performance test to try out various synchronization
diff --git a/src/test/java/perf/ManualIntRead.java b/src/test/java/perf/ManualIntRead.java
index e16bd74e9e..6a2a6f07f6 100644
--- a/src/test/java/perf/ManualIntRead.java
+++ b/src/test/java/perf/ManualIntRead.java
@@ -1,6 +1,7 @@
 package perf;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Manually run micro-benchmark for checking performance of tokenizing
diff --git a/src/test/java/perf/ManualReadPerfWithMedia.java b/src/test/java/perf/ManualReadPerfWithMedia.java
index 2e2733c184..c87f88a92b 100644
--- a/src/test/java/perf/ManualReadPerfWithMedia.java
+++ b/src/test/java/perf/ManualReadPerfWithMedia.java
@@ -1,6 +1,7 @@
 package perf;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class ManualReadPerfWithMedia extends ParserTestBase
 {
diff --git a/src/test/java/perf/ManualSmallTokenRead.java b/src/test/java/perf/ManualSmallTokenRead.java
index 4034135008..d1113b5f5b 100644
--- a/src/test/java/perf/ManualSmallTokenRead.java
+++ b/src/test/java/perf/ManualSmallTokenRead.java
@@ -1,6 +1,7 @@
 package perf;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 /**
  * Manually run micro-benchmark for checking performance of tokenizing
diff --git a/src/test/java/perf/MediaItem.java b/src/test/java/perf/MediaItem.java
index ab780503ac..38be323077 100644
--- a/src/test/java/perf/MediaItem.java
+++ b/src/test/java/perf/MediaItem.java
@@ -5,6 +5,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 
 public class MediaItem
 {