diff --git a/lib/jnpr/jsnapy/snap.py b/lib/jnpr/jsnapy/snap.py
index aaa2cf01..2ba428a5 100755
--- a/lib/jnpr/jsnapy/snap.py
+++ b/lib/jnpr/jsnapy/snap.py
@@ -269,13 +269,16 @@ def run_rpc(self, test_file, t, formats, dev, output_file, hostname, db):
                     #     "Taking snapshot of RPC: %s" %
                     #     rpc,
                     #     extra=self.log_detail)
+                    options_rpc = {'format': reply_format}
+                    if 'options' in kwargs:
+                        options_rpc.update(kwargs['options'])
+                        kwargs.pop('options')
                     rpc_reply = getattr(
                         dev.rpc,
                         rpc.replace(
                             '-',
                             '_'))(
-                        options={
-                            'format': reply_format},
+                        options=options_rpc,
                         **kwargs)
                 else:
                     self.logger_snap.error(