diff --git a/build.gradle b/build.gradle
index 643ee35e66..1b3b61e335 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         classpath 'org.shipkit:shipkit-changelog:1.2.0'
         classpath 'org.shipkit:shipkit-auto-version:1.2.2'
 
-        classpath 'com.google.googlejavaformat:google-java-format:1.15.0'
+        classpath 'com.google.googlejavaformat:google-java-format:1.16.0'
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
     }
@@ -123,9 +123,10 @@ spotless {
         licenseHeaderFile rootProject.file('config/spotless/spotless.header')
 
         custom 'google-java-format', { source ->
-            com.google.googlejavaformat.java.JavaFormatterOptions options = new com.google.googlejavaformat.java.JavaFormatterOptions.Builder()
+            com.google.googlejavaformat.java.JavaFormatterOptions options = new com.google.googlejavaformat.java.AutoValue_JavaFormatterOptions.Builder()
                     .style(com.google.googlejavaformat.java.JavaFormatterOptions.Style.AOSP)
                     .formatJavadoc(false)
+                    .reorderModifiers(true)
                     .build()
             com.google.googlejavaformat.java.Formatter formatter = new com.google.googlejavaformat.java.Formatter(options)
             return formatter.formatSource(source)
diff --git a/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java b/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java
index c882704caa..30094c58b8 100644
--- a/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java
+++ b/src/main/java/org/mockito/internal/creation/instance/ConstructorInstantiator.java
@@ -64,7 +64,8 @@ private <T> T withParams(Class<T> cls, Object... params) {
 
     @SuppressWarnings("unchecked")
     private static <T> T invokeConstructor(Constructor<?> constructor, Object... params)
-            throws java.lang.InstantiationException, IllegalAccessException,
+            throws java.lang.InstantiationException,
+                    IllegalAccessException,
                     InvocationTargetException {
         MemberAccessor accessor = Plugins.getMemberAccessor();
         return (T) accessor.newInstance(constructor, params);