diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
index 030542254a633..e9c5432aa4b2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteNodeRunner.java
@@ -116,8 +116,10 @@ public static void storeToFile(IgniteConfiguration cfg, String fileName,
         try (OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName))) {
             IgniteConfiguration cfg0 = new IgniteConfiguration(cfg);
 
-            if (resetDiscovery)
-                cfg0.setDiscoverySpi(null);
+            if (resetDiscovery) {
+                if (cfg0.getDiscoverySpi() instanceof TcpDiscoverySpi)
+                    cfg0.setDiscoverySpi(null);
+            }
 
             cfg0.setWorkDirectory(U.defaultWorkDirectory());
             cfg0.setMBeanServer(null);