diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index 0a45688..3f1f8d1 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -1370,6 +1370,7 @@ static void test_EM_AUTOURLDETECT(void)
   int i, j;
   int urlRet=-1;
   HWND hwndRichEdit, parent;
+  SETTEXTEX st;
 
   /* All of the following should cause the URL to be detected  */
   const char * templates_delim[] = {
@@ -1456,12 +1457,9 @@ static void test_EM_AUTOURLDETECT(void)
     SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text);
     check_CFE_LINK_rcvd(hwndRichEdit, urls[i].is_url, urls[i].text);
   }
-  DestroyWindow(hwndRichEdit);
+  i = 0;
 
   /* Test detection of URLs within normal text - WM_SETTEXT case. */
-  for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
-    hwndRichEdit = new_richedit(parent);
-
     for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) {
       char * at_pos;
       int at_offset;
@@ -1511,6 +1509,7 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     for (j = 0; j < sizeof(templates_non_delim) / sizeof(const char *); j++) {
@@ -1552,6 +1551,7 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     for (j = 0; j < sizeof(templates_xten_delim) / sizeof(const char *); j++) {
@@ -1607,11 +1607,9 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +2, end_offset +3, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
-    DestroyWindow(hwndRichEdit);
-    hwndRichEdit = NULL;
-  }
 
 #define INSERT_CR \
   do { \
@@ -1634,9 +1632,6 @@ static void test_EM_AUTOURLDETECT(void)
   } while (0)
 
   /* Test detection of URLs within normal text - WM_CHAR case. */
-  for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
-    hwndRichEdit = new_richedit(parent);
-
     for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) {
       char * at_pos;
       int at_offset;
@@ -1764,16 +1759,11 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
-    DestroyWindow(hwndRichEdit);
-    hwndRichEdit = NULL;
-  }
 
-  /* Test detection of URLs within normal text - EM_SETTEXTEX case. */
-  for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
-    SETTEXTEX st;
 
-    hwndRichEdit = new_richedit(parent);
+  /* Test detection of URLs within normal text - EM_SETTEXTEX case. */
 
     /* There are at least three ways in which EM_SETTEXTEX must cause URLs to
        be detected:
@@ -1837,6 +1827,7 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     /* Set selection with X to the URL */
@@ -1891,6 +1882,7 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     /* Set selection with X to the first character of the URL, then the rest */
@@ -1950,15 +1942,10 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
-    DestroyWindow(hwndRichEdit);
-    hwndRichEdit = NULL;
-  }
-
   /* Test detection of URLs within normal text - EM_REPLACESEL case. */
-  for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) {
-    hwndRichEdit = new_richedit(parent);
 
     /* Set selection with X to the URL */
     for (j = 0; j < sizeof(templates_delim) / sizeof(const char *); j++) {
@@ -2009,6 +1996,7 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     /* Set selection with X to the first character of the URL, then the rest */
@@ -2065,11 +2053,11 @@ static void test_EM_AUTOURLDETECT(void)
             "CFE_LINK incorrectly set in (%d-%d), text: %s\n", end_offset +1, end_offset +2, buffer);
         }
       }
+      i = (i + 1) % sizeof(urls)/sizeof(struct urls_s);
     }
 
     DestroyWindow(hwndRichEdit);
     hwndRichEdit = NULL;
-  }
 
   DestroyWindow(parent);
 }