@@ -101,7 +101,7 @@ do_one_test (json_ctx_t *json_ctx, impl_t *impl, char *dst, char *src,
             copy_t *copy, size_t n)
 {
  timing_t start, stop, cur;
-Â size_t iters = INNER_LOOP_ITERS * 20;
+Â size_t iters = INNER_LOOP_ITERS_MEDIUM;
Â
  TIMING_NOW (start);
  for (int i = 0; i < iters; ++i)
@@ -103,12 +103,8 @@ test_main (void)
  json_array_begin (&json_ctx, "results");
  for (size_t i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1)
    {
-     /* Test length alignments from 0-16 bytes. */
-Â Â Â Â Â for (int j = 0; j < 8; j++)
-Â Â Â Â Â Â {
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + j);
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + 16 - j);
-Â Â Â Â Â Â }
+Â Â Â Â Â do_test (&json_ctx, i);
+Â Â Â Â Â do_test (&json_ctx, i + 1);
    }
Â
  json_array_end (&json_ctx);
@@ -105,7 +105,7 @@ static void
 do_one_test (impl_t *impl, const void *haystack, size_t haystack_len,
             const void *needle, size_t needle_len, const void *expected)
 {
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_SMALL;
  timing_t start, stop, cur;
Â
  TIMING_NOW (start);
@@ -107,23 +107,15 @@ test_main (void)
  /* Non-overlapping buffers. */
  for (size_t i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1)
    {
-     /* Test length alignments from 0-16 bytes. */
-Â Â Â Â Â for (int j = 0; j < 8; j++)
-Â Â Â Â Â Â {
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + j, false);
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + 16 - j, false);
-Â Â Â Â Â Â }
+Â Â Â Â Â do_test (&json_ctx, i, false);
+Â Â Â Â Â do_test (&json_ctx, i + 1, false);
    }
Â
  /* Overlapping buffers. */
  for (size_t i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1)
    {
-     /* Test length alignments from 0-16 bytes. */
-Â Â Â Â Â for (int j = 0; j < 8; j++)
-Â Â Â Â Â Â {
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + j, true);
-Â Â Â Â Â Â Â Â do_test (&json_ctx, i + 16 - j, true);
-Â Â Â Â Â Â }
+Â Â Â Â Â do_test (&json_ctx, i, true);
+Â Â Â Â Â do_test (&json_ctx, i + 1, true);
    }
Â
  json_array_end (&json_ctx);
@@ -112,13 +112,16 @@ test_main (void)
Â
  json_array_begin (&json_ctx, "results");
  for (i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1)
-     /* Test length alignments from 0-16 bytes. */
-Â Â Â Â Â for (int j = 0; j < i && j < 16; j++)
-Â Â Â Â Â Â do_test (&json_ctx, 65, i + j);
+Â Â Â {
+Â Â Â Â Â do_test (&json_ctx, 65, i);
+Â Â Â Â Â do_test (&json_ctx, 65, i + 1);
+Â Â Â }
Â
  for (i = START_SIZE; i <= MIN_PAGE_SIZE; i <<= 1)
-Â Â Â Â Â for (int j = 0; j < i && j < 16; j++)
-Â Â Â Â Â Â do_test (&json_ctx, 0, i + j);
+Â Â Â {
+Â Â Â Â Â do_test (&json_ctx, 0, i);
+Â Â Â Â Â do_test (&json_ctx, 0, i + 1);
+Â Â Â }
Â
  json_array_end (&json_ctx);
  json_attr_object_end (&json_ctx);
@@ -36,7 +36,7 @@ IMPL (strcasestr, 1)
 static void
 do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result)
 {
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_SMALL;
  timing_t start, stop, cur;
Â
  TIMING_NOW (start);
@@ -124,7 +124,9 @@ extern impl_t __start_impls[], __stop_impls[];
 # define OPT_RANDOM 10001
 # define OPT_SEED 10002
Â
-# define INNER_LOOP_ITERS 64
+# define INNER_LOOP_ITERS 8192
+# define INNER_LOOP_ITERS_MEDIUM 1024
+# define INNER_LOOP_ITERS_SMALL 32
Â
 int ret, do_srandom;
 unsigned int seed;
@@ -66,7 +66,7 @@ static void
 do_one_test (impl_t *impl, const CHAR *s, const CHAR *rej, RES_TYPE exp_res)
 {
  RES_TYPE res = CALL (impl, s, rej);
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_MEDIUM;
  timing_t start, stop, cur;
Â
  if (res != exp_res)
@@ -103,7 +103,7 @@ IMPL (oldstrsep, 2)
 static void
 do_one_test (impl_t * impl, const char *s1, const char *s2)
 {
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_SMALL;
  timing_t start, stop, cur;
Â
  TIMING_NOW (start);
@@ -60,7 +60,7 @@ SIMPLE_STRSPN (const CHAR *s, const CHAR *acc)
 static void
 do_one_test (impl_t *impl, const CHAR *s, const CHAR *acc, size_t exp_res)
 {
-Â size_t res = CALL (impl, s, acc), i, iters = INNER_LOOP_ITERS;
+Â size_t res = CALL (impl, s, acc), i, iters = INNER_LOOP_ITERS_MEDIUM;
  timing_t start, stop, cur;
Â
  if (res != exp_res)
@@ -131,7 +131,7 @@ IMPL (basic_strstr, 0)
 static void
 do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result)
 {
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_SMALL;
  timing_t start, stop, cur;
  char *res;
Â
@@ -60,7 +60,7 @@ IMPL (strtok, 1)
 static void
 do_one_test (impl_t * impl, const char *s1, const char *s2)
 {
-Â size_t i, iters = INNER_LOOP_ITERS;
+Â size_t i, iters = INNER_LOOP_ITERS_SMALL;
  timing_t start, stop, cur;
  TIMING_NOW (start);
  for (i = 0; i < iters; ++i)