new file mode 100644
--- /dev/null
+++ b/tests/test-count-one-bits.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007 Free Software Foundation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.  */
+
+/* Written by Ben Pfaff.  */
+
+#include <config.h>
+
+#include "count-one-bits.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ASSERT(expr)                                            \
+  do                                                            \
+    {                                                           \
+      if (!(expr))                                              \
+        {                                                       \
+          fprintf (stderr, "%s:%d: assertion \"%s\" failed\n",  \
+                   __FILE__, __LINE__, #expr);                  \
+          abort ();                                             \
+        }                                                       \
+    }                                                           \
+  while (0)
+
+#define UINT_BIT (sizeof (unsigned int) * CHAR_BIT)
+#define ULONG_BIT (sizeof (unsigned long int) * CHAR_BIT)
+#define ULLONG_BIT (sizeof (unsigned long long int) * CHAR_BIT)
+
+#ifndef ULLONG_MAX
+# define HALF (1ULL << (sizeof (unsigned long long int) * CHAR_BIT - 1))
+# define ULLONG_MAX (HALF - 1 + HALF)
+#endif
+
+int
+main (int argc, char *argv[])
+{
+  int i, j;
+
+#define TEST_COUNT_ONE_BITS(FUNC, TYPE, BITS, MAX, ONE) \
+  ASSERT (FUNC (0) == 0);                               \
+  for (i = 0; i < BITS; i++)                            \
+    {                                                   \
+      ASSERT (FUNC (ONE << i) == 1);                    \
+      for (j = i + 1; j < BITS; j++)                    \
+        ASSERT (FUNC ((ONE << i) | (ONE << j)) == 2);   \
+    }                                                   \
+  for (i = 0; i < 1000; i++)                            \
+    {                                                   \
+      TYPE value = rand () ^ (rand () << 31 << 1);      \
+      int count = 0;                                    \
+      for (j = 0; j < BITS; j++)                        \
+        count += (value & (ONE << j)) != 0;             \
+      ASSERT (count == FUNC (value));                   \
+    }                                                   \
+  ASSERT (FUNC (MAX) == BITS);
+
+  TEST_COUNT_ONE_BITS (count_one_bits, unsigned int, UINT_BIT, UINT_MAX, 1U);
+  TEST_COUNT_ONE_BITS (count_one_bits_l, unsigned long int,
+                       ULONG_BIT, ULONG_MAX, 1UL);
+#ifdef HAVE_UNSIGNED_LONG_LONG_INT
+  TEST_COUNT_ONE_BITS (count_one_bits_ll,
+                       unsigned long long int, ULLONG_BIT, ULLONG_MAX, 1ULL);
+#endif
+
+  return 0;
+}