diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py
index ce7878c240..3e1e6eb79b 100755
--- a/tests/topotests/conftest.py
+++ b/tests/topotests/conftest.py
@@ -9,6 +9,7 @@ import re
 import subprocess
 import sys
 import time
+import resource
 
 import pytest
 import lib.fixtures
@@ -221,6 +222,9 @@ def pytest_configure(config):
         is_xdist = True
         is_worker = True
 
+    resource.setrlimit(
+        resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY)
+    )
     # -----------------------------------------------------
     # Set some defaults for the pytest.ini [pytest] section
     # ---------------------------------------------------
@@ -505,5 +509,6 @@ def pytest_runtest_makereport(item, call):
 #
 # Add common fixtures available to all tests as parameters
 #
+
 tgen = pytest.fixture(lib.fixtures.tgen)
 topo = pytest.fixture(lib.fixtures.topo)
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 6ee000b0f4..4e613ce8ac 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -1386,7 +1386,6 @@ class Router(Node):
             if params.get("routertype") is not None:
                 self.routertype = params.get("routertype")
 
-        self.cmd("ulimit -c unlimited")
         # Set ownership of config files
         self.cmd("chown {0}:{0}vty /etc/{0}".format(self.routertype))