diff --git a/ChangeLog b/ChangeLog
index 60f76450e5..bef50d40f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-30  Maciej W. Rozycki  <macro@wdc.com>
+
+	* sysdeps/unix/sysv/linux/riscv/configure.ac: Quote
+	$libc_cv_riscv_float_abi in `test' invocation.
+	* sysdeps/unix/sysv/linux/riscv/configure: Regenerate.
+
 2019-03-29  Paul A. Clarke  <pc@us.ibm.com>
 
 	* sysdeps/powerpc/fpu/fenv_libc.h (fegetenv_register): Replace inline
diff --git a/sysdeps/unix/sysv/linux/riscv/configure b/sysdeps/unix/sysv/linux/riscv/configure
index 816e9145eb..3018ca8f1b 100755
--- a/sysdeps/unix/sysv/linux/riscv/configure
+++ b/sysdeps/unix/sysv/linux/riscv/configure
@@ -178,7 +178,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 fi
 rm -f conftest*
 
-if test $libc_cv_riscv_float_abi = no; then
+if test "$libc_cv_riscv_float_abi" = no; then
   as_fn_error $? "Unable to determine floating-point ABI" "$LINENO" 5
 fi
 
diff --git a/sysdeps/unix/sysv/linux/riscv/configure.ac b/sysdeps/unix/sysv/linux/riscv/configure.ac
index 4fae013ec9..d4819931ca 100644
--- a/sysdeps/unix/sysv/linux/riscv/configure.ac
+++ b/sysdeps/unix/sysv/linux/riscv/configure.ac
@@ -20,7 +20,7 @@ AC_EGREP_CPP(yes, [#ifdef __riscv_float_abi_soft
 		   yes
 		   #endif
   ],libc_cv_riscv_float_abi=)
-if test $libc_cv_riscv_float_abi = no; then
+if test "$libc_cv_riscv_float_abi" = no; then
   AC_MSG_ERROR([Unable to determine floating-point ABI])
 fi