diff --git a/jerry-main/main-unix-minimal.c b/jerry-main/main-unix-minimal.c
index bb0438881..1fe10fdce 100644
--- a/jerry-main/main-unix-minimal.c
+++ b/jerry-main/main-unix-minimal.c
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+#include <stdlib.h>
 #include <string.h>
 
 #include "jerryscript.h"
diff --git a/targets/riot-stm32f4/source/main-riotos.c b/targets/riot-stm32f4/source/main-riotos.c
index ddeb362d2..3a803f8f7 100644
--- a/targets/riot-stm32f4/source/main-riotos.c
+++ b/targets/riot-stm32f4/source/main-riotos.c
@@ -14,10 +14,12 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "shell.h"
 #include "jerryscript.h"
 #include "jerryscript-ext/handler.h"
+#include "jerryscript-port.h"
 
 /**
  * Standalone Jerry exit codes
diff --git a/tools/run-tests.py b/tools/run-tests.py
index 516c32bc1..536f42c65 100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -128,6 +128,8 @@ JERRY_BUILDOPTIONS = [
             ['--jerry-libc=off', '--compile-flag=-m32', '--cpointer-32bit=on', '--system-allocator=on']),
     Options('buildoption_test-external_context',
             ['--jerry-libc=off', '--external-context=on']),
+    Options('buildoption_test-cmdline_minimal',
+            ['--jerry-cmdline-minimal=on']),
     Options('buildoption_test-snapshot_tool',
             ['--jerry-cmdline-snapshot=on']),
 ]