diff --git a/ChangeLog b/ChangeLog
index 11d868e2df..d5e3e8f968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
 	  query, otherwise the search will fail later.
 	  Fixes #141526.
 
+	* src/engine/test/test-numeric.c:
+	  Make sure we use gint64 instead of gint when trying to test
+	  values > 2^32.
+
 2004-12-02  Derek Atkins  <derek@ihtfp.com>
 
 	* src/business/business-ledger/Makefile.am: add explicit
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index 08c52db8e1..1a66d06188 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -26,7 +26,6 @@ LDADD = \
 # that they should be executed, with more basic tests coming first.
 # 
 TESTS = \
-  test-book-merge \
   test-link \
   test-load-engine \
   test-guid \
diff --git a/src/engine/test/test-numeric.c b/src/engine/test/test-numeric.c
index ddb37ffae5..419ad50fb8 100644
--- a/src/engine/test/test-numeric.c
+++ b/src/engine/test/test-numeric.c
@@ -131,21 +131,21 @@ check_reduce (void)
 	check_unary_op (gnc_numeric_eq,
 	                gnc_numeric_create (5011617,167108327),
 	                rval,
-                   val, "expected %s = %s = reduce(%s)");
+                   val, "check_reduce(1) expected %s = %s = reduce(%s)");
 
 	val = gnc_numeric_create(17474724864LL,136048896LL);
 	rval = gnc_numeric_reduce (val);
 	check_unary_op (gnc_numeric_eq,
 	                gnc_numeric_create (4*17*17,9),
 	                rval,
-                   val, "expected %s = %s = reduce(%s)");
+                   val, "check_reduce(2) expected %s = %s = reduce(%s)");
 
 	val = gnc_numeric_create(1024LL,1099511627776LL);
 	rval = gnc_numeric_reduce (val);
 	check_unary_op (gnc_numeric_eq,
 	                gnc_numeric_create (1,1024*1024*1024),
 	                rval,
-                   val, "expected %s = %s = reduce(%s)");
+                   val, "check_reduce(3): expected %s = %s = reduce(%s)");
 }
 
 /* ======================================================= */
@@ -154,8 +154,8 @@ static void
 check_equality_operator (void)
 {
 	int i, m;
-	gint deno, mult, numer;
-	gint64 f;
+	gint mult;
+	gint64 f, deno, numer;
 	gnc_numeric big, rbig;
 	gnc_numeric val, mval;
 	gnc_numeric bval, rval;