diff --git a/test/net/sourceforge/zmanim/hebrewcalendar/YomiCalculatorTest.java b/test/net/sourceforge/zmanim/hebrewcalendar/YomiCalculatorTest.java
new file mode 100644
index 00000000..25b65b4a
--- /dev/null
+++ b/test/net/sourceforge/zmanim/hebrewcalendar/YomiCalculatorTest.java
@@ -0,0 +1,38 @@
+package net.sourceforge.zmanim.hebrewcalendar;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class YomiCalculatorTest {
+	private static HebrewDateFormatter hdf = new HebrewDateFormatter();
+	static {
+		hdf.setHebrewFormat(true);		
+	}
+	 
+	@Test
+	public void testCorrectDaf1() {
+		JewishCalendar jewishCalendar = new JewishCalendar(5685, JewishDate.KISLEV, 12);
+		Daf daf = YomiCalculator.getDafYomiBavli(jewishCalendar);
+		Assert.assertEquals(5, daf.getMasechtaNumber());
+		Assert.assertEquals(2, daf.getDaf());
+		System.out.println(hdf.formatDafYomiYerushalmi(jewishCalendar.getDafYomiBavli()));
+	}
+
+	@Test
+	public void testCorrectDaf2() {
+		JewishCalendar jewishCalendar = new JewishCalendar(5736, JewishDate.ELUL, 26);
+		Daf daf = YomiCalculator.getDafYomiBavli(jewishCalendar);
+		Assert.assertEquals(4, daf.getMasechtaNumber());
+		Assert.assertEquals(14, daf.getDaf());
+		System.out.println(hdf.formatDafYomiYerushalmi(jewishCalendar.getDafYomiBavli()));
+	}
+	
+	@Test
+	public void testCorrectDaf3() {
+		JewishCalendar jewishCalendar = new JewishCalendar(5777, JewishDate.ELUL, 10);
+		Daf daf = YomiCalculator.getDafYomiBavli(jewishCalendar);
+		Assert.assertEquals(23, daf.getMasechtaNumber());
+		Assert.assertEquals(47, daf.getDaf());
+		System.out.println(hdf.formatDafYomiYerushalmi(jewishCalendar.getDafYomiBavli()));
+	}
+}