diff --git a/FizzBuzz.py b/FizzBuzz.py
new file mode 100644
index 0000000..b5f55fb
--- /dev/null
+++ b/FizzBuzz.py
@@ -0,0 +1,8 @@
+def fizz_buzz(num):
+    if num % 3 == 0 and num % 5 == 0:
+        return "FizzBuzz"
+    elif num % 3 == 0:
+        return "Fizz"
+    elif num % 5 == 0:
+        return "Buzz"
+    return str(num)
diff --git a/TestFizzBuzz.py b/TestFizzBuzz.py
new file mode 100644
index 0000000..985aedf
--- /dev/null
+++ b/TestFizzBuzz.py
@@ -0,0 +1,20 @@
+import unittest
+from FizzBuzz import fizz_buzz
+
+
+class Tfb(unittest.TestCase):
+    def test_input_normal(self):
+        self.assertEqual(fizz_buzz(1), "1")
+
+    def test_input_3_5(self):
+        self.assertEqual(fizz_buzz(15), "FizzBuzz")
+
+    def test_input_3(self):
+        self.assertEqual(fizz_buzz(3), "Fizz")
+
+    def test_input_5(self):
+        self.assertEqual(fizz_buzz(5), "Buzz")
+
+
+if __name__ == "main":
+    unittest.main()