diff --git a/regression_test/XML/NegativeTest/Makefile b/regression_test/XML/NegativeTest/Makefile
index 277fe811b4c8e9c183a89055311f04b233a75bbe..b43d93b60290fc346564591256f46b2a8a02d367 100644
--- a/regression_test/XML/NegativeTest/Makefile
+++ b/regression_test/XML/NegativeTest/Makefile
@@ -46,7 +46,13 @@ CXXDEPFLAGS = -MM
 #COMPILER_FLAGS +=
 
 # Execution mode: (either ttcn3 or ttcn3-parallel)
-TTCN3_LIB := ttcn3-rt2
+TTCN3_LIB := ttcn3-rt2$(DYNAMIC_SUFFIX)
+
+ifdef DYN
+LIB_SUFFIX := .so
+else
+LIB_SUFFIX := .a
+endif
 
 #
 # You may change these variables. Add your files if necessary...
@@ -98,7 +104,7 @@ all: $(TARGET) ;
 
 objects: $(OBJECTS) ;
 
-$(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
+$(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB)$(LIB_SUFFIX)
 	$(CXX) $(LDFLAGS) -o $@ $^ \
 	-L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
 	-L$(OPENSSL_DIR)/lib -lcrypto \
@@ -117,7 +123,7 @@ $(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
 $(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
 	@if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
 
-compile:: $(firstword $(TTCN3_COMPILER)) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
+compile:: $(firstword $(TTCN3_COMPILER)) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB)$(LIB_SUFFIX)
 	@if [ -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
 
 compile:: $(TTCN3_MODULES) $(ASN1_MODULES)
diff --git a/regression_test/fuzzy/Makefile b/regression_test/fuzzy/Makefile
index 614786d4a53ea889173d2b66bdf1146d1806e344..164051aa853321604d53f93dd457275ad53b9469 100644
--- a/regression_test/fuzzy/Makefile
+++ b/regression_test/fuzzy/Makefile
@@ -26,6 +26,15 @@ ifeq ($(COVERAGE), yes)
   COVERAGE_FLAG += -C
 endif
 
+ifdef DYN
+ifeq ($(PLATFORM), WIN32)
+  export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+else
+  export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
+endif
+DYNFLAG := -l
+endif
+
 DIR_SINGLE := dir_single_mode
 DIR_PARALLEL := dir_parallel_mode
 GENERATED_DIRS := $(DIR_SINGLE) $(DIR_PARALLEL)
@@ -38,12 +47,12 @@ all: $(GENERATED_DIRS)
 $(DIR_SINGLE):
 	mkdir $@
 	cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done
-	cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s -e $(RUNNABLE) ./*  && $(MAKE_PROG)
+	cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) $(RT2_FLAG) $(DYNFLAG) -s -e $(RUNNABLE) ./*  && $(MAKE_PROG)
 
 $(DIR_PARALLEL):
 	mkdir $@
 	cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done
-	cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -e $(RUNNABLE) ./*  && $(MAKE_PROG)
+	cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) $(RT2_FLAG) $(DYNFLAG) -e $(RUNNABLE) ./*  && $(MAKE_PROG)
 
 run: $(GENERATED_DIRS)
 	cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) && grep "Overall verdict: pass" *.log