diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java b/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
new file mode 100755
index 0000000000..c9043a045b
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
@@ -0,0 +1,144 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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.xssf.model;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRElt;
+import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRPrElt;
+
+import junit.framework.TestCase;
+
+/**
+ * Test SharedStringsTable, the cache of strings in a workbook
+ *
+ * @author Yegor Kozlov
+ */
+public class TestSharedStringsTable extends TestCase {
+	private File xml;
+	
+	protected void setUp() throws Exception {
+		xml = new File(
+				System.getProperty("HSSF.testdata.path") +
+				File.separator + "sample.xlsx"
+		);
+		assertTrue(xml.exists());
+	}
+
+	public void testCreateNew() throws Exception {
+		SharedStringsTable sst = new SharedStringsTable();
+		
+        CTRst st;
+        int idx;
+
+        // Check defaults
+		assertNotNull(sst.getItems());
+		assertEquals(0, sst.getItems().size());
+        assertEquals(0, sst.getCount());
+        assertEquals(0, sst.getUniqueCount());
+
+        st = CTRst.Factory.newInstance();
+        st.setT("Hello, World!");
+
+        idx = sst.addEntry(st);
+        assertEquals(0, idx);
+        assertEquals(1, sst.getCount());
+        assertEquals(1, sst.getUniqueCount());
+
+        //add the same entry egain
+        idx = sst.addEntry(st);
+        assertEquals(0, idx);
+        assertEquals(2, sst.getCount());
+        assertEquals(1, sst.getUniqueCount());
+
+        //and egain
+        idx = sst.addEntry(st);
+        assertEquals(0, idx);
+        assertEquals(3, sst.getCount());
+        assertEquals(1, sst.getUniqueCount());
+
+        st = CTRst.Factory.newInstance();
+        st.setT("Second string");
+
+        idx = sst.addEntry(st);
+        assertEquals(1, idx);
+        assertEquals(4, sst.getCount());
+        assertEquals(2, sst.getUniqueCount());
+
+        //add the same entry egain
+        idx = sst.addEntry(st);
+        assertEquals(1, idx);
+        assertEquals(5, sst.getCount());
+        assertEquals(2, sst.getUniqueCount());
+
+        st = CTRst.Factory.newInstance();
+        CTRElt r = st.addNewR();
+        CTRPrElt pr = r.addNewRPr();
+        pr.addNewColor().setRgb(new byte[]{(byte)0xFF, 0, 0}); //red
+        pr.addNewI().setVal(true);  //bold
+        pr.addNewB().setVal(true);  //italic
+        r.setT("Second string");
+
+        idx = sst.addEntry(st);
+        assertEquals(2, idx);
+        assertEquals(6, sst.getCount());
+        assertEquals(3, sst.getUniqueCount());
+
+        idx = sst.addEntry(st);
+        assertEquals(2, idx);
+        assertEquals(7, sst.getCount());
+        assertEquals(3, sst.getUniqueCount());
+
+        //ok. the sst table is filled, check the contents
+        assertEquals(3, sst.getItems().size());
+        assertEquals("Hello, World!", new XSSFRichTextString(sst.getEntryAt(0)).toString());
+        assertEquals("Second string", new XSSFRichTextString(sst.getEntryAt(1)).toString());
+        assertEquals("Second string", new XSSFRichTextString(sst.getEntryAt(2)).toString());
+    }
+	
+	public void testReadWrite() throws Exception {
+        XSSFWorkbook wb = new XSSFWorkbook(xml.getPath());
+        SharedStringsTable sst1 = (SharedStringsTable)wb.getSharedStringSource();
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        sst1.writeTo(out);
+
+        //serialize, read back and compare with the original
+        SharedStringsTable sst2 = new SharedStringsTable(new ByteArrayInputStream(out.toByteArray()));
+        assertEquals(sst1.getCount(), sst2.getCount());
+        assertEquals(sst1.getUniqueCount(), sst2.getUniqueCount());
+
+        List<CTRst> items1 = sst1.getItems();
+        List<CTRst> items2 = sst2.getItems();
+        assertEquals(items1.size(), items2.size());
+        for (int i = 0; i < items1.size(); i++) {
+            CTRst st1 = items1.get(i);
+            CTRst st2 = items2.get(i);
+            assertEquals(st1.toString(), st2.toString());
+        }
+    }
+}