Index: subversion/tests/svn_test_main.c
===================================================================
--- subversion/tests/svn_test_main.c	(revision 1659217)
+++ subversion/tests/svn_test_main.c	(working copy)
@@ -46,6 +46,7 @@
 #include "svn_ctype.h"
 #include "svn_utf.h"
 #include "svn_version.h"
+#include "svn_fs.h"
 
 #include "private/svn_cmdline_private.h"
 #include "private/svn_atomic.h"
@@ -762,12 +763,8 @@ svn_test_main(int argc, const char *argv[], int ma
 
   opts.fs_type = DEFAULT_FS_TYPE;
 
-  /* Initialize APR (Apache pools) */
-  if (apr_initialize() != APR_SUCCESS)
-    {
-      printf("apr_initialize() failed.\n");
-      exit(1);
-    }
+  if (svn_cmdline_init("svn_tests", stderr) != EXIT_SUCCESS)
+    exit(1);
 
   /* set up the global pool.  Use a separate allocator to limit memory
    * usage but make it thread-safe to allow for multi-threaded tests.
@@ -784,6 +781,13 @@ svn_test_main(int argc, const char *argv[], int ma
   test_argc = argc;
   test_argv = argv;
 
+  err = svn_fs_initialize(pool);
+  if (err)
+    {
+      svn_handle_error2(err, stderr, TRUE, "svn_tests: ");
+      svn_error_clear(err);
+    }
+
   err = init_test_data(argv[0], pool);
   if (err)
     {