3 files changed, 23 insertions, 11 deletions
diff --git a/test/scaladoc/run/SI-4826-no-comments.check b/test/scaladoc/run/SI-4826-no-comments.check
new file mode 100644
index 0000000000..3925a0d464
--- /dev/null
+++ b/test/scaladoc/run/SI-4826-no-comments.check
@@ -0,0 +1 @@
+Done.
+\ No newline at end of file
diff --git a/test/scaladoc/run/SI-4826-no-comments.scala b/test/scaladoc/run/SI-4826-no-comments.scala
new file mode 100644
index 0000000000..217fc29d81
--- /dev/null
+++ b/test/scaladoc/run/SI-4826-no-comments.scala
@@ -0,0 +1,20 @@
+import scala.tools.nsc.doc.Universe
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocJavaModelTest
+
+object Test extends ScaladocJavaModelTest {
+
+  override def resourceFile = "SI-4826.java"
+  override def scaladocSettings = "-no-java-comments"
+
+  def testModel(rootPackage: Package) = {
+    import access._
+
+    val base = rootPackage._package("test")._package("scaladoc")
+    val clazz = base._class("JavaComments")
+    val method = clazz._method("answer")
+
+    assert(clazz.comment == None)
+    assert(method.comment == None)
+  }
+}
diff --git a/test/scaladoc/run/SI-4826.scala b/test/scaladoc/run/SI-4826.scala
index 277ff37692..6d4b3a6da7 100644
--- a/test/scaladoc/run/SI-4826.scala
+++ b/test/scaladoc/run/SI-4826.scala
@@ -1,19 +1,10 @@
 import scala.tools.nsc.doc.Universe
 import scala.tools.nsc.doc.model._
-import scala.tools.partest.ScaladocModelTest
+import scala.tools.partest.ScaladocJavaModelTest
 
-object Test extends ScaladocModelTest {
+object Test extends ScaladocJavaModelTest {
 
   override def resourceFile = "SI-4826.java"
-
-  // overridden to pass explicit files to newDocFactory.makeUniverse (rather than code strings)
-  // since the .java file extension is required
-  override def model: Option[Universe] = {
-    val path = resourcePath + "/" + resourceFile
-    newDocFactory.makeUniverse(Left(List(path)))
-  }
-
-  // no need for special settings
   override def scaladocSettings = ""
 
   def testModel(rootPackage: Package) = {