--- old/test/jdk/tools/jpackage/linux/base/Base.java	2019-07-16 22:11:32.542241350 +0300
+++ new/test/jdk/tools/jpackage/linux/base/Base.java	2019-07-16 22:11:32.225458931 +0300
@@ -57,11 +57,22 @@
         }
     }
 
+    static String getRpmArch() {
+        String arch = System.getProperty("os.arch"); // JVM arch
+        if ("x86".equals(arch))
+            return "i386";
+        if ("amd64".equals(arch))
+            return "x86_64";
+        if ("arm".equals(arch))
+            return "armv7hl";
+        return arch;
+    }
+
     private static void init(String name, String ext) {
         TEST_NAME = name;
         EXT = ext;
         if (EXT.equals("rpm")) {
-            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1.x86_64." + EXT;
+            OUTPUT = "output" + File.separator + TEST_NAME + "-1.0-1." + getRpmArch() + "." + EXT;
         } else {
             OUTPUT = "output" + File.separator + TEST_NAME + "-1.0." + EXT;
         }