--- /dev/null	2019-02-15 09:11:05.676000757 +0100
+++ new/test/jdk/tools/jlink/plugins/DefaultStripDebugPluginTest.java	2019-02-15 17:55:00.122521422 +0100
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.Map;
+
+import jdk.tools.jlink.internal.ResourcePoolManager;
+import jdk.tools.jlink.internal.plugins.DefaultStripDebugPlugin;
+import jdk.tools.jlink.internal.plugins.DefaultStripDebugPlugin.NativePluginFactory;
+import jdk.tools.jlink.plugin.Plugin;
+import jdk.tools.jlink.plugin.ResourcePool;
+import jdk.tools.jlink.plugin.ResourcePoolBuilder;
+import jdk.tools.jlink.plugin.ResourcePoolEntry;
+import jdk.tools.jlink.plugin.ResourcePoolEntry.Type;
+
+/*
+ * @test
+ * @summary Test for combination of java debug attributes stripping and
+ * native debug symbols stripping.
+ * @author Severin Gehwolf
+ * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
+ * @run main/othervm DefaultStripDebugPluginTest
+ */
+public class DefaultStripDebugPluginTest {
+
+    public void testWithNativeStripPresent() {
+        MockStripPlugin javaPlugin = new MockStripPlugin(false);
+        MockStripPlugin nativePlugin = new MockStripPlugin(true);
+        TestNativeStripPluginFactory nativeFactory =
+                                 new TestNativeStripPluginFactory(nativePlugin);
+        DefaultStripDebugPlugin plugin = new DefaultStripDebugPlugin(javaPlugin,
+                                                                     nativeFactory);
+        ResourcePoolManager inManager = new ResourcePoolManager();
+        ResourcePool pool = plugin.transform(inManager.resourcePool(),
+                                             inManager.resourcePoolBuilder());
+        if (!pool.findEntry(MockStripPlugin.JAVA_PATH).isPresent() ||
+            !pool.findEntry(MockStripPlugin.NATIVE_PATH).isPresent()) {
+            throw new AssertionError("Expected both native and java to get called");
+        }
+    }
+
+    public void testNoNativeStripPluginPresent() {
+        MockStripPlugin javaPlugin = new MockStripPlugin(false);
+        TestNativeStripPluginFactory nativeFactory =
+                                         new TestNativeStripPluginFactory(null);
+        DefaultStripDebugPlugin plugin = new DefaultStripDebugPlugin(javaPlugin,
+                                                                     nativeFactory);
+        ResourcePoolManager inManager = new ResourcePoolManager();
+        ResourcePool pool = plugin.transform(inManager.resourcePool(),
+                                             inManager.resourcePoolBuilder());
+        if (!pool.findEntry(MockStripPlugin.JAVA_PATH).isPresent()) {
+            throw new AssertionError("Expected java strip plugin to get called");
+        }
+    }
+
+    public static void main(String[] args) {
+        DefaultStripDebugPluginTest test = new DefaultStripDebugPluginTest();
+        test.testNoNativeStripPluginPresent();
+        test.testWithNativeStripPresent();
+    }
+
+    public static class MockStripPlugin implements Plugin {
+
+        private static final String NATIVE_PATH = "/foo/lib/test.so.debug";
+        private static final String JAVA_PATH = "/foo/TestClass.class";
+        private static final String STRIP_NATIVE_NAME = "strip-native-debug-symbols";
+        private static final String OMIT_ARG = "omit-debuginfo";
+        private final boolean isNative;
+
+        MockStripPlugin(boolean isNative) {
+            this.isNative = isNative;
+        }
+
+        @Override
+        public void configure(Map<String, String> config) {
+            if (isNative) {
+                if (config.get(STRIP_NATIVE_NAME) == null ||
+                    !config.get(STRIP_NATIVE_NAME).equals(OMIT_ARG)) {
+                    throw new AssertionError("Test failed!, Expected native " +
+                                             "plugin to be properly configured.");
+                } else {
+                    System.out.println("DEBUG: native plugin properly configured with: " +
+                                       STRIP_NATIVE_NAME + "=" + config.get(STRIP_NATIVE_NAME));
+                }
+            }
+        }
+
+        @Override
+        public ResourcePool transform(ResourcePool in,
+                                      ResourcePoolBuilder out) {
+            in.transformAndCopy((r) -> {return r; }, out); // identity
+            String resPath = JAVA_PATH;
+            ResourcePoolEntry.Type type = Type.CLASS_OR_RESOURCE;
+            if (isNative) {
+                resPath = NATIVE_PATH;
+                type = Type.NATIVE_LIB;
+            }
+            ResourcePoolEntry entry = createMockEntry(resPath, type);
+            out.add(entry);
+            return out.build();
+        }
+
+        private ResourcePoolEntry createMockEntry(String path,
+                                                  ResourcePoolEntry.Type type) {
+            byte[] mockContent = new byte[] { 0, 1, 2, 3 };
+            ResourcePoolEntry entry = ResourcePoolEntry.create(path,
+                                                               type,
+                                                               mockContent);
+            return entry;
+        }
+
+    }
+
+    public static class TestNativeStripPluginFactory implements NativePluginFactory {
+
+        private final MockStripPlugin plugin;
+
+        TestNativeStripPluginFactory(MockStripPlugin plugin) {
+            this.plugin = plugin;
+        }
+
+        @Override
+        public Plugin create() {
+            return plugin;
+        }
+
+    }
+}