diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
new file mode 100644
index 000000000..86bf79d38
--- /dev/null
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
@@ -0,0 +1,63 @@
+
+/* ====================================================================
+   Copyright 2002-2004   Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+        
+
+
+package org.apache.poi.hslf.model;
+
+
+import junit.framework.TestCase;
+import org.apache.poi.hslf.*;
+import org.apache.poi.hslf.model.*;
+import org.apache.poi.hslf.usermodel.*;
+import org.apache.poi.hslf.record.SlideAtom;
+
+/**
+ * Tests that changing a slide's idea of what notes sheet is its works right
+ *
+ * @author Nick Burch (nick at torchbox dot com)
+ */
+public class TestSlideChangeNotes extends TestCase {
+	// SlideShow primed on the test data
+	private SlideShow ss;
+
+    public TestSlideChangeNotes() throws Exception {
+		String dirname = System.getProperty("HSLF.testdata.path");
+		String filename = dirname + "/basic_test_ppt_file.ppt";
+		HSLFSlideShow hss = new HSLFSlideShow(filename);
+		ss = new SlideShow(hss);
+    }
+
+    public void testSetToNone() throws Exception {
+		Slide slideOne = ss.getSlides()[0];
+		SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
+
+		slideOne.setNotes(null);
+
+		assertEquals(0, sa.getNotesID());
+    }
+
+    public void testSetToSomething() throws Exception {
+		Slide slideOne = ss.getSlides()[0];
+		Notes notesOne = ss.getNotes()[1];
+		SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
+
+		slideOne.setNotes(notesOne);
+
+		assertEquals(notesOne.getSheetNumber(), sa.getNotesID());
+    }
+}