diff --git a/Fizz.py b/Fizz.py
new file mode 100644
index 0000000..cb9e850
--- /dev/null
+++ b/Fizz.py
@@ -0,0 +1,11 @@
+def FizzBuzz(i):
+    if i % 15 == 0:
+        return "FizzBuzz"
+
+    if i % 3 == 0:
+        return "Fizz"
+
+    if i % 5 == 0:
+        return "Buzz"
+
+    return i
diff --git a/test_Fizz.py b/test_Fizz.py
new file mode 100644
index 0000000..373caec
--- /dev/null
+++ b/test_Fizz.py
@@ -0,0 +1,14 @@
+import unittest
+from Fizz import FizzBuzz
+
+
+class test(unittest.TestCase):
+    def test_fizz(self):
+        self.assertEqual("FizzBuzz", FizzBuzz(30))
+        self.assertEqual("Fizz", FizzBuzz(3))
+        self.assertEqual("Buzz", FizzBuzz(10))
+        self.assertEqual(31, FizzBuzz(31))
+
+
+if __name__ == '__main__':
+    unittest.main()