diff --git a/stack_test.rb b/stack_test.rb
new file mode 100644
index 0000000..1a9fb42
--- /dev/null
+++ b/stack_test.rb
@@ -0,0 +1,26 @@
+require "./stack"
+require "minitest"
+require "minitest/autorun"
+
+class TestStack < Minitest::Test
+  def setup
+    @stack = Stack.new
+  end
+
+  def test_that_returns_nil_from_empty_stack
+    assert_nil @stack.pop
+  end
+
+  def test_that_can_push_and_pop_one_item
+    @stack.push(1)
+    assert_equal 1, @stack.pop
+  end
+
+  def test_that_can_push_and_pop_multiple_items
+    @stack.push(1)
+    @stack.push(2)
+    assert_equal 2, @stack.pop
+    assert_equal 1, @stack.pop
+  end
+
+end
\ No newline at end of file