diff --git a/fizzbuzz.py b/fizzbuzz.py
new file mode 100644
index 0000000..25aa0a6
--- /dev/null
+++ b/fizzbuzz.py
@@ -0,0 +1,8 @@
+def fizzBuzz(value):
+    if value % 15 == 0:
+        return "fizzbuzz"
+    elif value % 3 == 0:
+        return "fizz"
+    elif value % 5 == 0:
+        return "buzz"
+    return str(value)
diff --git a/fizzbuzz_test.py b/fizzbuzz_test.py
new file mode 100644
index 0000000..c0d0c79
--- /dev/null
+++ b/fizzbuzz_test.py
@@ -0,0 +1,22 @@
+from fizzbuzz import fizzBuzz
+
+
+def checkFizzBuzz(value, expectedVal):
+    retVal = fizzBuzz(value)
+    assert retVal == expectedVal
+
+
+def test_fizzBuzzRtnNum():
+    checkFizzBuzz(1, "1")
+
+
+def test_fizzBuzzRtnFizz():
+    checkFizzBuzz(3, "fizz")
+
+
+def test_fizzBuzzRtnBuzz():
+    checkFizzBuzz(5, "buzz")
+
+
+def test_fizzBuzzRtnFizzBuzz():
+    checkFizzBuzz(15, "fizzbuzz")