diff --git a/doc/source/whatsnew/v0.25.1.rst b/doc/source/whatsnew/v0.25.1.rst
index 21f1fa7ddec1f..751829f11570f 100644
--- a/doc/source/whatsnew/v0.25.1.rst
+++ b/doc/source/whatsnew/v0.25.1.rst
@@ -25,7 +25,6 @@ Bug fixes
 Categorical
 ^^^^^^^^^^^
 
--
 -
 -
 
diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst
index aeed3668fe774..c4f1317ad0c67 100644
--- a/doc/source/whatsnew/v1.0.0.rst
+++ b/doc/source/whatsnew/v1.0.0.rst
@@ -87,6 +87,7 @@ Bug fixes
 Categorical
 ^^^^^^^^^^^
 
+- Added test to assert the :func:`fillna` raises the correct ValueError message when the value isn't a value from categories (:issue:`13628`)
 -
 -
 
diff --git a/pandas/tests/arrays/categorical/test_missing.py b/pandas/tests/arrays/categorical/test_missing.py
index 1b62479530d24..3037ac79cd592 100644
--- a/pandas/tests/arrays/categorical/test_missing.py
+++ b/pandas/tests/arrays/categorical/test_missing.py
@@ -5,7 +5,7 @@
 
 from pandas.core.dtypes.dtypes import CategoricalDtype
 
-from pandas import Categorical, Index, isna
+from pandas import Categorical, Index, Series, isna
 import pandas.util.testing as tm
 
 
@@ -59,11 +59,13 @@ def test_set_item_nan(self):
             ),
             (dict(), "Must specify a fill 'value' or 'method'."),
             (dict(method="bad"), "Invalid fill method. Expecting .* bad"),
+            (dict(value=Series([1, 2, 3, 4, "a"])), "fill value must be in categories"),
         ],
     )
     def test_fillna_raises(self, fillna_kwargs, msg):
         # https://github.com/pandas-dev/pandas/issues/19682
-        cat = Categorical([1, 2, 3])
+        # https://github.com/pandas-dev/pandas/issues/13628
+        cat = Categorical([1, 2, 3, None, None])
 
         with pytest.raises(ValueError, match=msg):
             cat.fillna(**fillna_kwargs)