diff --git a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
index e3bce19be72..dad0edf7366 100644
--- a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
+++ b/j2k/tests/testData/ast/enum/class/runnableImplementation.kt
@@ -4,7 +4,7 @@ BLACK
 RED
 YELLOW
 BLUE
-public override fun run() : Unit {
+override public fun run() : Unit {
 System.out?.println("name()=" + name() + ", toString()=" + toString())
 }
 public fun name() : String { return "" }
diff --git a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
index b132aa896a5..eea76d734e4 100644
--- a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
+++ b/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
@@ -1,15 +1,15 @@
 package test
 open class Test() : Base() {
-public override fun hashCode() : Int {
+override public fun hashCode() : Int {
 return super.hashCode()
 }
-public override fun equals(o : Any?) : Boolean {
+override public fun equals(o : Any?) : Boolean {
 return super.equals(o)
 }
 override protected fun clone() : Any? {
 return super.clone()
 }
-public override fun toString() : String? {
+override public fun toString() : String? {
 return super.toString()
 }
 override protected fun finalize() : Unit {
diff --git a/j2k/tests/testData/ast/issues/file/kt-696.kt b/j2k/tests/testData/ast/issues/file/kt-696.kt
index 512d0de5d2f..9369e8ec092 100644
--- a/j2k/tests/testData/ast/issues/file/kt-696.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-696.kt
@@ -11,13 +11,13 @@ return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
 }
 }
 open class Child() : Base() {
-public override fun hashCode() : Int {
+override public fun hashCode() : Int {
 return super.hashCode()
 }
-public override fun equals(o : Any?) : Boolean {
+override public fun equals(o : Any?) : Boolean {
 return super.equals(o)
 }
-public override fun toString() : String? {
+override public fun toString() : String? {
 return super.toString()
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-836.kt b/j2k/tests/testData/ast/issues/file/kt-836.kt
index 938269632b7..d7ab78c24fd 100644
--- a/j2k/tests/testData/ast/issues/file/kt-836.kt
+++ b/j2k/tests/testData/ast/issues/file/kt-836.kt
@@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 public open class Language(code : String?) : Serializable {
 protected var code : String? = null
-public override fun toString() : String? {
+override public fun toString() : String? {
 return this.code
 }
 {
diff --git a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
index 502ace95174..4d8d3ac6e19 100644
--- a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
+++ b/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
@@ -1,7 +1,7 @@
 package demo
 import java.util.Iterator
 open class Test() : java.lang.Iterable<String?> {
-public override fun iterator() : java.util.Iterator<String?>? {
+override public fun iterator() : java.util.Iterator<String?>? {
 return null
 }
 open public fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
@@ -10,7 +10,7 @@ return j
 }
 }
 open class FullTest() : java.lang.Iterable<String?> {
-public override fun iterator() : java.util.Iterator<String?>? {
+override public fun iterator() : java.util.Iterator<String?>? {
 return null
 }
 open public fun push(i : java.util.Iterator<String?>?) : java.util.Iterator<String?>? {
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
index 29038a298dc..bfee0514886 100644
--- a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
+++ b/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
@@ -1,5 +1,5 @@
 object : Runnable() {
-public override fun run() : Unit {
+override public fun run() : Unit {
 System.out?.println("Run")
 }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt
index b704b724419..bb49c2e14d5 100644
--- a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt
+++ b/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt
@@ -6,12 +6,12 @@ open public fun windowClosing() : Unit {
 public class Client() : Frame() {
 {
 var a : WindowAdapter? = object : WindowAdapter() {
-public override fun windowClosing() : Unit {
+override public fun windowClosing() : Unit {
 }
 }
 addWindowListener(a)
 addWindowListener(object : WindowAdapter() {
-public override fun windowClosing() : Unit {
+override public fun windowClosing() : Unit {
 }
 })
 }