diff --git a/setup.csh b/setup.csh
index e84c2362c..6b9fa6020 100755
--- a/setup.csh
+++ b/setup.csh
@@ -29,6 +29,9 @@ echo '$WALLY set to ' ${WALLY}
 # utility functions in Wally repository
 extend PATH $WALLY/bin
 
+# Verilator needs a larger stack to simulate CORE-V Wally
+limit stacksize unlimited
+
 # load site licenses and tool locations
 if ( -e "${RISCV}"/site-setup.csh ) then
     source $RISCV/site-setup.csh
diff --git a/setup.sh b/setup.sh
index 7d511588f..390af63c4 100644
--- a/setup.sh
+++ b/setup.sh
@@ -33,6 +33,9 @@ echo \$WALLY set to "${WALLY}"
 # utility functions in Wally repository
 export PATH=$WALLY/bin:$PATH
 
+# Verilator needs a larger stack to simulate CORE-V Wally
+ulimit -c 300000
+
 # load site licenses and tool locations
 if [ -e "${RISCV}"/site-setup.sh ]; then
     source "${RISCV}"/site-setup.sh
diff --git a/site-setup.csh b/site-setup.csh
index 6ee000438..a656a7c0e 100644
--- a/site-setup.csh
+++ b/site-setup.csh
@@ -37,9 +37,6 @@ setenv RISCV_GCC `which riscv64-unknown-elf-gcc`		            # Copy this as it
 setenv RISCV_OBJCOPY `which riscv64-unknown-elf-objcopy`	        # Copy this as it is
 setenv SPIKE_PATH $RISCV/bin										# Change this for your path to riscv-isa-sim (spike)
 
-# Verilator needs a larger stack to simulate CORE-V Wally
-limit stacksize unlimited
-
 # Imperas; put this in if you are using it
 #set path = ($RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64 $path)
 #setenv LD_LIBRARY_PATH $RISCV/imperas_riscv_tests/riscv-ovpsim-plus/bin/Linux64:$LD_LIBRARY_PATH # remove if no imperas
diff --git a/site-setup.sh b/site-setup.sh
index 768fc6013..8a4043baa 100755
--- a/site-setup.sh
+++ b/site-setup.sh
@@ -41,9 +41,6 @@ export RISCV_GCC=$(which riscv64-unknown-elf-gcc)		            # Copy this as it
 export RISCV_OBJCOPY=$(which riscv64-unknown-elf-objcopy)	        # Copy this as it is
 export SPIKE_PATH=$RISCV/bin										# Change this for your path to riscv-isa-sim (spike)
 
-# Verilator needs a larger stack to simulate CORE-V Wally
-ulimit -c 300000
-
 # Imperas OVPsim; put this in if you are using it
 #export PATH=$RISCV/imperas-riscv-tests/riscv-ovpsim-plus/bin/Linux64:$PATH
 #export LD_LIBRARY_PATH=$RISCV/imperas_riscv_tests/riscv-ovpsim-plus/bin/Linux64:$LD_LIBRARY_PATH