diff --git a/.gitignore b/.gitignore
index 1ff57af1..19d35dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ obj
 *.sln.DotSettings.user
 .vs
 vendor
+.idea/
diff --git a/Java/src/test/java/com/gildedrose/GildedRoseShould.java b/Java/src/test/java/com/gildedrose/GildedRoseShould.java
new file mode 100644
index 00000000..436ca6b1
--- /dev/null
+++ b/Java/src/test/java/com/gildedrose/GildedRoseShould.java
@@ -0,0 +1,47 @@
+package com.gildedrose;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class GildedRoseShould {
+
+
+    @Test
+    void decrease_sellIn_and_maintains_quality_when_item_name_is_not_Sulfuras_and_quality_is_0() {
+        Item[] items = {new Item("NOT Sulfuras, Hand of Ragnaros", 10, 0)};
+        GildedRose gildedRose = new GildedRose(items);
+
+        gildedRose.updateQuality();
+
+        assertEquals(9, gildedRose.items[0].sellIn);
+        assertEquals(0, gildedRose.items[0].quality);
+    }
+
+    @Test
+    void decrease_sellIn_and_decrease_quality_when_item_name_is_not_Sulfuras_and_positive_quality() {
+        Item[] items = {new Item("NOT Sulfuras, Hand of Ragnaros", 10, 10)};
+        GildedRose gildedRose = new GildedRose(items);
+
+        gildedRose.updateQuality();
+
+        assertEquals(9, gildedRose.items[0].sellIn);
+        assertEquals(9, gildedRose.items[0].quality);
+    }
+
+    @Test
+    void decrease_sellIn_and_decrease_quality_when_item_name_is_AgedBrie_and_quality_is_40() {
+        Item[] items = {new Item("Aged Brie", 10, 40)};
+        GildedRose gildedRose = new GildedRose(items);
+
+        gildedRose.updateQuality();
+
+        assertEquals(9, gildedRose.items[0].sellIn);
+        assertEquals(41, gildedRose.items[0].quality);
+    }
+
+
+
+}
diff --git a/Java/src/test/java/com/gildedrose/GildedRoseTest.java b/Java/src/test/java/com/gildedrose/GildedRoseTest.java
deleted file mode 100644
index 8ae29eec..00000000
--- a/Java/src/test/java/com/gildedrose/GildedRoseTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gildedrose;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class GildedRoseTest {
-
-    @Test
-    void foo() {
-        Item[] items = new Item[] { new Item("foo", 0, 0) };
-        GildedRose app = new GildedRose(items);
-        app.updateQuality();
-        assertEquals("fixme", app.items[0].name);
-    }
-
-}