--- a/test/jdk/jdk/internal/jimage/JImageOpenTest.java	Fri Aug 30 09:06:46 2019 +0200
+++ b/test/jdk/jdk/internal/jimage/JImageOpenTest.java	Fri Aug 30 16:44:20 2019 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,8 @@
 import java.util.stream.Stream;
 
 /*
- * jimage shared open testing.
  * @test
  * @summary Test to see if thread interrupt handling interferes with other threads.
- * @build JImageOpenTest.java
  * @run main/othervm -Djdk.image.map.all=false JImageOpenTest
  */
 public class JImageOpenTest {

--- a/test/jdk/jdk/internal/jimage/JImageReadTest.java	Fri Aug 30 09:06:46 2019 +0200
+++ b/test/jdk/jdk/internal/jimage/JImageReadTest.java	Fri Aug 30 16:44:20 2019 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @summary Unit test for libjimage JIMAGE_Open/Read/Close
  * @modules java.base/jdk.internal.jimage
+ * @run testng JImageReadTest
  */
 
 import java.io.File;

--- a/test/jdk/jdk/internal/jimage/TEST.properties	Fri Aug 30 09:06:46 2019 +0200
+++ b/test/jdk/jdk/internal/jimage/TEST.properties	Fri Aug 30 16:44:20 2019 +0800
@@ -1,7 +1,1 @@
-# This file identifies root(s) of the test-ng hierarchy.
-
-TestNG.dirs = .
-
-modules=java.base/jdk.internal.jimage
-
-javatest.maxOutputSize = 2500000
+maxOutputSize = 2500000