diff --git a/helloworld.py b/helloworld.py
index 449b948..1d43bc3 100644
--- a/helloworld.py
+++ b/helloworld.py
@@ -1,2 +1,13 @@
 def get_greetings():
     return 'Hello World!'
+
+
+def fizzbuzz(i):
+    if i % 3 == 0 and i % 5 == 0:
+        return 'fizzbuzz'
+    elif i % 3 == 0:
+        return 'fizz'
+    elif i % 5 == 0:
+        return 'buzz'
+    else:
+        return str(i)
diff --git a/helloworld_test.py b/helloworld_test.py
index 4c27dfe..881cae3 100644
--- a/helloworld_test.py
+++ b/helloworld_test.py
@@ -1,5 +1,10 @@
 from helloworld import get_greetings
+from helloworld import fizzbuzz
 
 
 def test_get_helloworld():
     assert get_greetings() == 'Hello World!'
+    assert fizzbuzz(1) == '1'
+    assert fizzbuzz(3) == 'fizz'
+    assert fizzbuzz(5) == 'buzz'
+    assert fizzbuzz(15) == 'fizzbuzz'