diff --git a/edalize/templates/libero/libero-syn-user.tcl.j2 b/edalize/templates/libero/libero-syn-user.tcl.j2
index 885812e3d..dece16704 100644
--- a/edalize/templates/libero/libero-syn-user.tcl.j2
+++ b/edalize/templates/libero/libero-syn-user.tcl.j2
@@ -3,14 +3,14 @@
 # Libero
 
 {% if vlogparam -%}{%- for k,v in vlogparam.items() %}
-set_option -hdl_param -set {{k}}={{ v|generic_value_str(bool_is_str=True) }}
+set_option -hdl_param -set {{k}}={{ v|generic_value_str(str_quote_style="\"", bool_is_str=True) }}
 {% endfor -%}{%- endif %}
 {% if vlogdefine -%}{%- for k,v in vlogdefine.items() %}
-set_option -hdl_define -set {{k}}={{ v|generic_value_str(bool_is_str=True) }}
+set_option -hdl_define -set {{k}}={{ v|generic_value_str(str_quote_style="\"", bool_is_str=True) }}
 {% endfor -%}{%- endif %}
 {% if generic -%}
 set_option -hdl_param -set {
-  {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(bool_is_str=True) }} {% endfor -%}
+  {%- for k, v in generic.items() %}{{ k }}={{ v|generic_value_str(str_quote_style="\"", bool_is_str=True) }} {% endfor -%}
   }
 {%- endif %}
 
diff --git a/tests/test_libero/libero-test-all-syn-user.tcl b/tests/test_libero/libero-test-all-syn-user.tcl
index 36f43baaa..962ce7e62 100644
--- a/tests/test_libero/libero-test-all-syn-user.tcl
+++ b/tests/test_libero/libero-test-all-syn-user.tcl
@@ -4,9 +4,9 @@
 
 set_option -hdl_param -set vlogparam_bool=true
 set_option -hdl_param -set vlogparam_int=42
-set_option -hdl_param -set vlogparam_str=hello
+set_option -hdl_param -set vlogparam_str="hello"
 set_option -hdl_define -set vlogdefine_bool=true
 set_option -hdl_define -set vlogdefine_int=42
-set_option -hdl_define -set vlogdefine_str=hello
+set_option -hdl_define -set vlogdefine_str="hello"
 
 set_option -include_path {../../.}
diff --git a/tests/test_libero/libero-test-syn-user.tcl b/tests/test_libero/libero-test-syn-user.tcl
index 36f43baaa..962ce7e62 100644
--- a/tests/test_libero/libero-test-syn-user.tcl
+++ b/tests/test_libero/libero-test-syn-user.tcl
@@ -4,9 +4,9 @@
 
 set_option -hdl_param -set vlogparam_bool=true
 set_option -hdl_param -set vlogparam_int=42
-set_option -hdl_param -set vlogparam_str=hello
+set_option -hdl_param -set vlogparam_str="hello"
 set_option -hdl_define -set vlogdefine_bool=true
 set_option -hdl_define -set vlogdefine_int=42
-set_option -hdl_define -set vlogdefine_str=hello
+set_option -hdl_define -set vlogdefine_str="hello"
 
 set_option -include_path {../../.}