diff --git a/Makefile b/Makefile
index 5594a605a..d598cbcbd 100644
--- a/Makefile
+++ b/Makefile
@@ -861,6 +861,7 @@ endif
 	+cd tests/various && bash run-test.sh
 	+cd tests/select && bash run-test.sh
 	+cd tests/sat && bash run-test.sh
+	+cd tests/scripts && bash run-test.sh
 	+cd tests/sim && bash run-test.sh
 	+cd tests/svinterfaces && bash run-test.sh $(SEEDOPT)
 	+cd tests/svtypes && bash run-test.sh $(SEEDOPT)
diff --git a/tests/scripts/.gitignore b/tests/scripts/.gitignore
new file mode 100644
index 000000000..102700103
--- /dev/null
+++ b/tests/scripts/.gitignore
@@ -0,0 +1,3 @@
+*.err
+*.log
+run-test.mk
diff --git a/tests/scripts/run-test.sh b/tests/scripts/run-test.sh
new file mode 100755
index 000000000..4fb3eb83d
--- /dev/null
+++ b/tests/scripts/run-test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+source ../gen-tests-makefile.sh
+run_tests --bash
diff --git a/tests/scripts/test_logging.sh b/tests/scripts/test_logging.sh
new file mode 100755
index 000000000..9910d8622
--- /dev/null
+++ b/tests/scripts/test_logging.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+var=0
+rm -f quotes-*.log quotes-*.err
+
+test_log()
+{
+    # Usage: test_log <log_str> <grep_str>
+    var=$((var + 1))
+    log_str="$1"
+    grep_str="$2"
+    log_file="quotes-$var.log"
+    ../../yosys -QTq -l $log_file -p "log $log_str"
+    if ! grep -qx "$grep_str" $log_file; then
+        echo "ERROR: Expected 'yosys> log $log_str' to log '$grep_str'." > "quotes-$var.err"
+        cat "quotes-$var.err"
+    fi
+}
+
+test_log "test" "test"
+test_log "test;" "test"
+test_log "test;;" "test"
+test_log "\"test" "\"test"
+test_log "test\"" "test\""
+test_log "\"test\"" "test"
+test_log "\"test;\"" "test;"
+test_log "\"test;;\"" "test;;"
+test_log "\"test\" abc" "\"test\" abc"
+
+if [ -f quotes-*.err ] ; then
+    exit 1
+fi