diff --git a/certbot/tests/crypto_util_test.py b/certbot/tests/crypto_util_test.py
index f0e2c017e..00303fab3 100644
--- a/certbot/tests/crypto_util_test.py
+++ b/certbot/tests/crypto_util_test.py
@@ -373,5 +373,18 @@ class Sha256sumTest(unittest.TestCase):
             '914ffed8daf9e2c99d90ac95c77d54f32cbd556672facac380f0c063498df84e')
 
 
+class CertAndChainFromFullchainTest(unittest.TestCase):
+    """Tests for certbot.crypto_util.cert_and_chain_from_fullchain"""
+
+    def test_cert_and_chain_from_fullchain(self):
+        cert_pem = CERT
+        chain_pem = CERT + SS_CERT
+        fullchain_pem = cert_pem + chain_pem
+        from certbot.crypto_util import cert_and_chain_from_fullchain
+        cert_out, chain_out = cert_and_chain_from_fullchain(fullchain_pem)
+        self.assertEqual(cert_out, cert_pem)
+        self.assertEqual(chain_out, chain_pem)
+
+
 if __name__ == '__main__':
     unittest.main()  # pragma: no cover