diff --git a/jdk/test/com/sun/jarsigner/DefaultMethod.java b/jdk/test/com/sun/jarsigner/DefaultMethod.java
index fba92813c59..db7a040b01d 100644
--- a/jdk/test/com/sun/jarsigner/DefaultMethod.java
+++ b/jdk/test/com/sun/jarsigner/DefaultMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
  * @bug 8039358
  * @summary com.sun.jarsigner.ContentSignerParameters.getTSAPolicyID() should be default
+ * @modules jdk.jartool
  * @compile DefaultMethod.java
  */
 
diff --git a/jdk/test/com/sun/net/httpserver/TEST.properties b/jdk/test/com/sun/net/httpserver/TEST.properties
new file mode 100644
index 00000000000..4981030a154
--- /dev/null
+++ b/jdk/test/com/sun/net/httpserver/TEST.properties
@@ -0,0 +1 @@
+modules = jdk.httpserver
\ No newline at end of file