--- a/test/jdk/java/lang/System/SetProperties.java	Fri Jul 06 10:28:56 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * 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.
- */
-
-/*
- * @test
- * @bug 4244670
- * @summary test System.setProperties(null)
- */
-
-import java.util.Properties;
-
-public class SetProperties {
-    public static void main(String [] argv) {
-        System.setProperties((Properties)null);
-        System.getProperties().containsKey("java.version");
-    }
-}

--- a/test/jdk/java/lang/System/SetPropertiesNull.java	Fri Jul 06 10:28:56 2018 -0700
+++ b/test/jdk/java/lang/System/SetPropertiesNull.java	Fri Jul 06 15:22:07 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -26,7 +26,7 @@
  * reinitialized after setting System.setProperties(null).
  *
  * @test
- * @bug 8030781
+ * @bug 4244670 8030781
  * @summary Test for System.setProperties(null).
  */