diff --git a/RIOT_Make/benchmark/Makefile.benchmark b/RIOT_Make/benchmark/Makefile.benchmark
index cf36a1375..ede8a7a03 100644
--- a/RIOT_Make/benchmark/Makefile.benchmark
+++ b/RIOT_Make/benchmark/Makefile.benchmark
@@ -10,7 +10,9 @@ RIOTBASE ?= $(CURDIR)/../../../../
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
 # development process:
-CFLAGS += -DDEVELHELP
+CFLAGS += -DDEVELHELP -DWOLFSSL_RIOT_OS
+
+WERROR=0
 
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
diff --git a/RIOT_Make/benchmark/wolf-build-and-run-test.sh b/RIOT_Make/benchmark/wolf-build-and-run-test.sh
index 214af842b..06f9c6947 100755
--- a/RIOT_Make/benchmark/wolf-build-and-run-test.sh
+++ b/RIOT_Make/benchmark/wolf-build-and-run-test.sh
@@ -20,9 +20,6 @@ wolf_riot_cleanup () {
 }
 trap wolf_riot_cleanup INT TERM
 
-BACKUPCFLAGS=${CFLAGS}
-export CFLAGS="${CFLAGS} -DWOLFSSL_RIOT_OS"
-
 # copy the necessary files to this directory
 wolf_riot_setup
 
@@ -40,7 +37,6 @@ fi
 ./bin/native/wolfbenchmark.elf
 
 # confirm success or failure
-export CFLAGS="${BACKUPCFLAGS}"
 RESULT=$?
  [ $RESULT != 0 ] && echo "TEST FAILED"  && wolf_riot_cleanup &&
                      echo "cleanup done" && exit 2
diff --git a/RIOT_Make/testsuite/Makefile.testsuite b/RIOT_Make/testsuite/Makefile.testsuite
index c4927bd91..0cd46c9f0 100644
--- a/RIOT_Make/testsuite/Makefile.testsuite
+++ b/RIOT_Make/testsuite/Makefile.testsuite
@@ -10,7 +10,9 @@ RIOTBASE ?= $(CURDIR)/../../../../
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
 # development process:
-CFLAGS += -DDEVELHELP
+CFLAGS += -DDEVELHELP -DNO_MAIN_DRIVER -DWOLFSSL_RIOT_OS
+
+WERROR=0
 
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
diff --git a/RIOT_Make/testsuite/wolf-build-and-run-test.sh b/RIOT_Make/testsuite/wolf-build-and-run-test.sh
index 523481059..2a416d292 100755
--- a/RIOT_Make/testsuite/wolf-build-and-run-test.sh
+++ b/RIOT_Make/testsuite/wolf-build-and-run-test.sh
@@ -26,9 +26,6 @@ wolf_riot_cleanup () {
 }
 trap wolf_riot_cleanup INT TERM
 
-BACKUPCFLAGS=${CFLAGS}
-export CFLAGS="${CFLAGS} -DNO_MAIN_DRIVER -DWOLFSSL_RIOT_OS"
-
 # copy the necessary files to this directory
 wolf_riot_setup
 
@@ -45,7 +42,6 @@ fi
 # run the test
 RESULT=`./bin/native/wolftestsuite.elf`
 # confirm success or failure
-export CFLAGS="${BACKUPCFLAGS}"
 errstring="error"
 if test "${RESULT#*$errstring}" != "$RESULT"
     then
diff --git a/RIOT_Make/wolfcrypt-test/Makefile.wolfcrypttest b/RIOT_Make/wolfcrypt-test/Makefile.wolfcrypttest
index b42a17b81..4222bb6b0 100644
--- a/RIOT_Make/wolfcrypt-test/Makefile.wolfcrypttest
+++ b/RIOT_Make/wolfcrypt-test/Makefile.wolfcrypttest
@@ -10,7 +10,9 @@ RIOTBASE ?= $(CURDIR)/../../../../
 # Comment this out to disable code in RIOT that does safety checking
 # which is not needed in a production environment but helps in the
 # development process:
-CFLAGS += -DDEVELHELP
+CFLAGS += -DDEVELHELP -DWOLFSSL_RIOT_OS
+
+WERROR=0
 
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
diff --git a/RIOT_Make/wolfcrypt-test/wolf-build-and-run-test.sh b/RIOT_Make/wolfcrypt-test/wolf-build-and-run-test.sh
index 5188724e2..6d7670d08 100755
--- a/RIOT_Make/wolfcrypt-test/wolf-build-and-run-test.sh
+++ b/RIOT_Make/wolfcrypt-test/wolf-build-and-run-test.sh
@@ -18,10 +18,6 @@ wolf_riot_cleanup () {
     rm Makefile
 }
 
-BACKUPCFLAGS=${CFLAGS}
-export CFLAGS="${CFLAGS} -DWOLFSSL_RIOT_OS"
-
-
 # copy the necessary files to this directory
 wolf_riot_setup
 
@@ -43,7 +39,6 @@ fi
 RESULT=`./bin/native/testwolfcrypt.elf`
 
 # confirm success or failure
-export CFLAGS="${BACKUPCFLAGS}"
 errstring="error"
 if test "${RESULT#*$errstring}" != "$RESULT"
     then