diff --git a/test/tw-2581.t b/test/tw-2581.t
new file mode 100755
index 000000000..b7120a3a6
--- /dev/null
+++ b/test/tw-2581.t
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Test setting configuration variable with a trailing comment works
+. bash_tap_tw.sh
+
+# Add configuration variable with a trailing comment into taskrc
+echo 'weekstart=Monday  # Europe standard' >> taskrc
+cat taskrc
+
+# Use config the change the value to "Sunday"
+task config weekstart Sunday
+
+# Ensure the comment was preserved and value changed
+cat taskrc | grep weekstart=Sunday
+[[ `cat taskrc | grep weekstart=Sunday` == 'weekstart=Sunday  # Europe standard' ]]