diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 4b615ab76dc9..0b9aef548fe7 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-11  Tom Tromey  <tromey@redhat.com>
 
+	For PR java/12915:
+	* libjava.lang/PR12915.java: New file.
+	* libjava.lang/PR12915.out: New file.
+
 	* libjava.jacks/jacks.exp (gcj_jacks_write): Enable "assert"
 	constraint.
 	* libjava.jacks/jacks.xfail: Added new xfails.
diff --git a/libjava/testsuite/libjava.lang/PR12915.java b/libjava/testsuite/libjava.lang/PR12915.java
new file mode 100644
index 000000000000..3a155f6e17e1
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR12915.java
@@ -0,0 +1,6 @@
+public class PR12915 {
+  public static void main(String[] args)
+  {
+    System.out.println(((String) null) + "");
+  }
+}
diff --git a/libjava/testsuite/libjava.lang/PR12915.out b/libjava/testsuite/libjava.lang/PR12915.out
new file mode 100644
index 000000000000..19765bd501b6
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/PR12915.out
@@ -0,0 +1 @@
+null