diff --git a/test/jdk/tools/jpackage/TEST.properties b/test/jdk/tools/jpackage/TEST.properties
index f6a0dc7dfc7..84d7dbea7ea 100644
--- a/test/jdk/tools/jpackage/TEST.properties
+++ b/test/jdk/tools/jpackage/TEST.properties
@@ -1,3 +1,6 @@
+# Assign "jpackagePlatformPackage" key on jpackage tests that output and
+# optionally install native packages. Don't use the key with tests that output
+# native packages but will never install them.
 keys = \
     jpackagePlatformPackage
 
diff --git a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
index d91f4e3504b..c0b7b6b6604 100644
--- a/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
+++ b/test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java
@@ -69,11 +69,9 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage with --type image --resource-dir "Info.plist" and "Runtime-Info.plist"
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @build CustomInfoPListTest
  * @requires (os.family == "mac")
- * @requires (jpackage.test.SQETest == null)
  * @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=CustomInfoPListTest
  */
diff --git a/test/jdk/tools/jpackage/macosx/DmgContentTest.java b/test/jdk/tools/jpackage/macosx/DmgContentTest.java
index f6c2fe63671..a2e1ab24651 100644
--- a/test/jdk/tools/jpackage/macosx/DmgContentTest.java
+++ b/test/jdk/tools/jpackage/macosx/DmgContentTest.java
@@ -38,7 +38,6 @@ import java.util.List;
  * @test
  * @summary jpackage with --type dmg --mac-dmg-content
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @build DmgContentTest
  * @requires (os.family == "mac")
diff --git a/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java b/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
index 5c4a7ac0e8e..7498043c14f 100644
--- a/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
+++ b/test/jdk/tools/jpackage/macosx/HostArchPkgTest.java
@@ -47,7 +47,6 @@ import jdk.jpackage.test.Annotations.Test;
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror HostArchPkgTest.java
  * @requires (os.family == "mac")
- * @key jpackagePlatformPackage
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=HostArchPkgTest
  */
diff --git a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
index 16cf616cfd3..32311fd121e 100644
--- a/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java
@@ -66,6 +66,7 @@ import jdk.jpackage.test.TKit;
  * @build jdk.jpackage.test.*
  * @build SigningPackageTwoStepTest
  * @requires (jpackage.test.MacSignTests == "run")
+ * @requires (jpackage.test.SQETest == null)
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningPackageTwoStepTest
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
diff --git a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
index efcaadc3fa8..856962d3b01 100644
--- a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
+++ b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java
@@ -80,6 +80,7 @@ import jdk.jpackage.test.TKit;
  * @build jdk.jpackage.test.*
  * @build SigningRuntimeImagePackageTest
  * @requires (jpackage.test.MacSignTests == "run")
+ * @requires (jpackage.test.SQETest == null)
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=SigningRuntimeImagePackageTest
  *  --jpt-before-run=SigningBase.verifySignTestEnvReady
diff --git a/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java b/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
index c41ba92c740..a10328d9e6c 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageSymbolicLinksTest.java
@@ -40,7 +40,6 @@ import jdk.jpackage.test.Executor;
  * @test
  * @summary jpackage with --runtime-image
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @requires (os.family != "windows")
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror RuntimeImageSymbolicLinksTest.java
diff --git a/test/jdk/tools/jpackage/share/RuntimeImageTest.java b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
index 1110a813cde..f5811596f75 100644
--- a/test/jdk/tools/jpackage/share/RuntimeImageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimeImageTest.java
@@ -34,7 +34,6 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage with --runtime-image
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror RuntimeImageTest.java
  * @run main/othervm/timeout=1400 jdk.jpackage.test.Main
diff --git a/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java b/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java
index bb2008bbda7..2da95c0ec9c 100644
--- a/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java
+++ b/test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java
@@ -40,7 +40,6 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage with installer exe from the resource directory
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror WinInstallerResourceTest.java
  * @requires (os.family == "windows")
diff --git a/test/jdk/tools/jpackage/windows/WinLongPathTest.java b/test/jdk/tools/jpackage/windows/WinLongPathTest.java
index e52441b961a..f9c7f5fe2b4 100644
--- a/test/jdk/tools/jpackage/windows/WinLongPathTest.java
+++ b/test/jdk/tools/jpackage/windows/WinLongPathTest.java
@@ -40,7 +40,6 @@ import jdk.jpackage.test.TKit;
  * @bug 8289771
  * @summary jpackage with long paths on windows
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @requires (os.family == "windows")
  * @compile -Xlint:all -Werror WinLongPathTest.java
diff --git a/test/jdk/tools/jpackage/windows/WinLongVersionTest.java b/test/jdk/tools/jpackage/windows/WinLongVersionTest.java
index 586b69c1913..2ee76bcaa15 100644
--- a/test/jdk/tools/jpackage/windows/WinLongVersionTest.java
+++ b/test/jdk/tools/jpackage/windows/WinLongVersionTest.java
@@ -66,19 +66,6 @@ import org.w3c.dom.NodeList;
  *    scenario must be uninstalled
  */
 
-/*
- * @test
- * @summary jpackage with long version number
- * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
- * @requires (jpackage.test.SQETest != null)
- * @build jdk.jpackage.test.*
- * @requires (os.family == "windows")
- * @compile -Xlint:all -Werror WinLongVersionTest.java
- * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=WinLongVersionTest.test
- */
-
 /*
  * @test
  * @summary jpackage with long version number
diff --git a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
index aea7e9e99b2..6a78f78e804 100644
--- a/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
+++ b/test/jdk/tools/jpackage/windows/WinOSConditionTest.java
@@ -34,11 +34,9 @@ import jdk.jpackage.test.TKit;
  * @test
  * @summary jpackage test that installer blocks on Windows of older version
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @compile -Xlint:all -Werror WinOSConditionTest.java
  * @requires (os.family == "windows")
- * @requires (jpackage.test.SQETest == null)
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=WinOSConditionTest
  */
diff --git a/test/jdk/tools/jpackage/windows/WinRenameTest.java b/test/jdk/tools/jpackage/windows/WinRenameTest.java
index 59107c43921..ab67ec7f4f9 100644
--- a/test/jdk/tools/jpackage/windows/WinRenameTest.java
+++ b/test/jdk/tools/jpackage/windows/WinRenameTest.java
@@ -33,7 +33,6 @@ import jdk.jpackage.test.Annotations.Test;
  * @test
  * @summary jpackage test app can run after changing executable's extension
  * @library /test/jdk/tools/jpackage/helpers
- * @key jpackagePlatformPackage
  * @build jdk.jpackage.test.*
  * @build WinRenameTest
  * @requires (os.family == "windows")