2 files changed, 13 insertions, 12 deletions
diff --git a/test/818-clinit-nterp/run b/test/818-clinit-nterp/run.py
index 52d2b5f760..0f3a0eacfd 100644
--- a/test/818-clinit-nterp/run
+++ b/test/818-clinit-nterp/run.py
@@ -14,4 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-exec ${RUN} $@ --profile
+
+def run(ctx, args):
+  ctx.default_run(args, profile=True)
diff --git a/test/818-clinit-nterp/src/Main.java b/test/818-clinit-nterp/src/Main.java
index 5342cecf2f..5ebd384797 100644
--- a/test/818-clinit-nterp/src/Main.java
+++ b/test/818-clinit-nterp/src/Main.java
@@ -15,20 +15,19 @@
  */
 
 public class Main {
-  public static void main(String[] args) {
-    Clinit.run();
-    if (!clinitDidRun) {
-      throw new Error("Expected Clinit.<clinit> to have run");
+    public static void main(String[] args) {
+        Clinit.run();
+        if (!clinitDidRun) {
+            throw new Error("Expected Clinit.<clinit> to have run");
+        }
     }
-  }
-  static boolean clinitDidRun = false;
+    static boolean clinitDidRun = false;
 }
 
 class Clinit {
-  public static void run() {
-  }
+    public static void run() {}
 
-  static {
-    Main.clinitDidRun = true;
-  }
+    static {
+        Main.clinitDidRun = true;
+    }
 }