diff --git a/tests/gnmi/conftest.py b/tests/gnmi/conftest.py
index 580d493e937..c783c82a455 100644
--- a/tests/gnmi/conftest.py
+++ b/tests/gnmi/conftest.py
@@ -237,6 +237,9 @@ def setup_gnmi_server(duthosts, rand_one_dut_hostname, localhost, ptfhost):
 
     # Rollback configuration
     rollback(duthost, SETUP_ENV_CP)
+    # Save the configuration
+    cmd = "config save -y"
+    duthost.shell(cmd, module_ignore_errors=True)
     recover_cert_config(duthost)