diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b6086598fa7..1cdbb63b631 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-04  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+	* configure.srv: Use '$enable_unittest' instead of '$development'
+	when checking whether to fill 'srv_regobj' on 'aarch64*-*-linux*'
+	case.
+
 2019-02-27  Tom Tromey  <tromey@adacore.com>
 
 	* gdbreplay.c (logchar): Handle \r\n.
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index d19d22b3a32..bec72e2b193 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -43,7 +43,7 @@ srv_linux_obj="linux-low.o linux-osdata.o linux-procfs.o linux-ptrace.o linux-wa
 case "${target}" in
   aarch64*-*-linux*)
 			srv_regobj="arm-with-neon.o"
-			if $development; then
+			if $enable_unittests; then
 			  srv_regobj="${srv_regobj} aarch64.o"
 			  srv_regobj="${srv_regobj} linux-aarch64-tdesc-selftest.o"
                         fi