diff --git a/tests/test-tweakdefaults.t b/tests/test-tweakdefaults.t
--- a/tests/test-tweakdefaults.t
+++ b/tests/test-tweakdefaults.t
@@ -1,4 +1,3 @@
-#testcases develwarn.true develwarn.false
   $ . "$TESTDIR/histedit-helpers.sh"
 
   $ cat >> $HGRCPATH << EOF
@@ -11,13 +10,6 @@
   > updatecheck=noconflict
   > EOF
 
-#if develwarn.false
-  $ cat >> $HGRCPATH << EOF
-  > [tweakdefaults]
-  > develwarn = False
-  > EOF
-#endif
-
 Setup repo
 
   $ hg init repo
@@ -752,7 +744,6 @@
   
 Test that developer warning is shown whenever ':' is used implicitly or explicitly
 
-#if develwarn.true
   $ hg log -G -T '{rev} {bookmarks}' -r '0:2'
   devel-warn: use of ':' is deprecated
    at: *tweakdefaults.py:* (_analyzewrap) (glob)
@@ -762,17 +753,15 @@
   |
   o  0
   
-#else
-  $ hg log -G -T '{rev} {bookmarks}' -r '0:2'
+
+  $ hg log -G -T '{rev} {bookmarks}' -r '0:2' --config tweakdefaults.develwarn=False
   o  2
   |
   o  1 master
   |
   o  0
   
-#endif
 
-#if develwarn.true
   $ hg log -G -T '{rev} {bookmarks}' -r ':2'
   devel-warn: use of ':' is deprecated
    at: *tweakdefaults.py:* (_analyzewrap) (glob)
@@ -782,17 +771,15 @@
   |
   o  0
   
-#else
-  $ hg log -G -T '{rev} {bookmarks}' -r ':2'
+
+  $ hg log -G -T '{rev} {bookmarks}' -r ':2' --config tweakdefaults.develwarn=False
   o  2
   |
   o  1 master
   |
   o  0
   
-#endif
 
-#if develwarn.true
   $ hg log -G -T '{rev} {bookmarks}' -r '0:'
   devel-warn: use of ':' is deprecated
    at: *tweakdefaults.py:* (_analyzewrap) (glob)
@@ -802,15 +789,14 @@
   |
   o  0
   
-#else
-  $ hg log -G -T '{rev} {bookmarks}' -r '0:'
+
+  $ hg log -G -T '{rev} {bookmarks}' -r '0:' --config tweakdefaults.develwarn=False
   o  2
   |
   o  1 master
   |
   o  0
   
-#endif
 
 In this testcase warning should not be shown
   $ hg log -G -T '{rev} {bookmarks}' -r ':'