diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index ef6b8dc5a97..b5ed72d67d7 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-24  Anthony Green  <green@cygnus.com>
+
+	* libjava.lang/Shazam.java: New file.
+	libjava.lang/Shazam.out: New file.
+
 1999-05-12  Andrew Haley  <aph@cygnus.com>
 
 	* libjava.lang/Invoke_2.java: New file.
diff --git a/libjava/testsuite/libjava.lang/Shazam.java b/libjava/testsuite/libjava.lang/Shazam.java
new file mode 100644
index 00000000000..d3defc0652c
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/Shazam.java
@@ -0,0 +1,18 @@
+import java.io.*;
+
+public class Shazam {
+
+  private static String shazam ()
+    {
+	try {
+	    return "shazam";
+	} finally {
+	    System.out.println ("The next line should say \"shazam\"");
+	}
+    }
+
+  public static void main (String[] args) 
+    {
+	System.out.println (shazam ());
+    }
+}
diff --git a/libjava/testsuite/libjava.lang/Shazam.out b/libjava/testsuite/libjava.lang/Shazam.out
new file mode 100644
index 00000000000..42cc30d7239
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/Shazam.out
@@ -0,0 +1,2 @@
+The next line should say "shazam"
+shazam