diff --git a/testing/parameters.c b/testing/parameters.c
index 745f1c15648ecd3ca2bc6921e994407399724585..c3a7dcd900b63b4b002ec2d8e0132b97f7a84596 100644
--- a/testing/parameters.c
+++ b/testing/parameters.c
@@ -160,10 +160,10 @@ parameters_read_list( parameter_t *param,
         previous = current;
         current  = current->next;
     }
+    assert( current == NULL );
 
     token = strtok_r( str, delim, &saveptr );
     while ( token != NULL ) {
-        assert( current == NULL );
         current = calloc( 1, sizeof(vallist_t) );
 
         /* Read the value */
@@ -179,7 +179,6 @@ parameters_read_list( parameter_t *param,
         }
 
         previous = current;
-        current  = NULL;
 
         /* Move to the next token */
         token = strtok_r( NULL, delim, &saveptr );
@@ -261,9 +260,9 @@ parameters_read_intrange( parameter_t *param,
         previous = current;
         current  = current->next;
     }
+    assert( current == NULL );
 
     while ( start <= end ) {
-        assert( current == NULL );
         current = calloc( 1, sizeof(vallist_t) );
 
         /* Read the value */
@@ -279,7 +278,6 @@ parameters_read_intrange( parameter_t *param,
         }
 
         previous = current;
-        current  = NULL;
 
         start += step;
     }