diff --git a/fizzbuzz.go b/fizzbuzz.go
index 1d52ca1..274444b 100644
--- a/fizzbuzz.go
+++ b/fizzbuzz.go
@@ -12,6 +12,10 @@ func FizzBuzz() {
 }
 
 func fizzOrBuzz(number int) string {
+	if number == 15 {
+		return "FizzBuzz"
+	}
+
 	if number%3 == 0 {
 		return "Fizz"
 	}
diff --git a/fizzbuzz_test.go b/fizzbuzz_test.go
index a083fa9..f8f364f 100644
--- a/fizzbuzz_test.go
+++ b/fizzbuzz_test.go
@@ -30,4 +30,8 @@ func TestFizzBuzz(t *testing.T) {
 		out := fizzOrBuzz(10)
 		assert.Equal(t, "Buzz", out)
 	})
+	t.Run("number 15", func(t *testing.T) {
+		out := fizzOrBuzz(15)
+		assert.Equal(t, "FizzBuzz", out)
+	})
 }