diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index e0136a0..341a142 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1280,6 +1280,32 @@
             -S "dumping 'expected mac' (20 bytes)" \
             -s "dumping 'expected mac' (10 bytes)"
 
+# Tests for Context serialization
+
+requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
+run_test    "Context serialization, client serializes/deserializes"
+            "$P_SRV serialize=0 exchanges=2" \
+            "$P_CLI serialize=1 exchanges=2" \
+            0 \
+            -c "Deserializing connection..."
+            -S "Deserializing connection..."
+
+requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
+run_test    "Context serialization, server serializes/deserializes"
+            "$P_SRV serialize=1 exchanges=2" \
+            "$P_CLI serialize=0 exchanges=2" \
+            0 \
+            -C "Deserializing connection..."
+            -s "Deserializing connection..."
+
+requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
+run_test    "Context serialization, both serialize/deserialize"
+            "$P_SRV serialize=1 exchanges=2" \
+            "$P_CLI serialize=1 exchanges=2" \
+            0 \
+            -c "Deserializing connection..."
+            -s "Deserializing connection..."
+
 # Tests for DTLS Connection ID extension
 
 # So far, the CID API isn't implemented, so we can't