7483 fix qunit

The final commit that lands must say
```
Closes gh-7483
Closes gh-7496