diff --git a/debian/control b/debian/control
index ad9b2d68a8eeceb0b84d9645a423402cb311c902_ZGViaWFuL2NvbnRyb2w=..741d00764d3ba09c10fe93e79bc7993c4810692a_ZGViaWFuL2NvbnRyb2w= 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@
  python-sphinx (>= 1.0.8),
  imagemagick,
  librsvg2-bin,
- curl,
  sphinx-common,
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.6
diff --git a/tests/test-evolve-serveronly-bundle2.t b/tests/test-evolve-serveronly-bundle2.t
index ad9b2d68a8eeceb0b84d9645a423402cb311c902_dGVzdHMvdGVzdC1ldm9sdmUtc2VydmVyb25seS1idW5kbGUyLnQ=..741d00764d3ba09c10fe93e79bc7993c4810692a_dGVzdHMvdGVzdC1ldm9sdmUtc2VydmVyb25seS1idW5kbGUyLnQ= 100644
--- a/tests/test-evolve-serveronly-bundle2.t
+++ b/tests/test-evolve-serveronly-bundle2.t
@@ -85,5 +85,5 @@
 Capacity testing
 ===================
 
-  $ curl -s http://localhost:$HGPORT/?cmd=hello
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=hello
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
@@ -89,4 +89,4 @@
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
-  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=capabilities
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
 
@@ -92,5 +92,5 @@
 
-  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ hg debugpushkey http://localhost:$HGPORT namespaces
   bookmarks	
   namespaces	
   obsolete	
@@ -145,8 +145,8 @@
 ===========================================
 (used by bitbucket to select which repo use evolve)
 
-  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ hg debugpushkey http://localhost:$HGPORT namespaces
   bookmarks	
   namespaces	
   obsolete	
   phases	
@@ -149,6 +149,6 @@
   bookmarks	
   namespaces	
   obsolete	
   phases	
-  $ curl -s http://localhost:$HGPORT/?cmd=hello
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=hello
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
@@ -154,6 +154,6 @@
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
-  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=capabilities
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
 
   $ echo '[experimental]' >> server/.hg/hgrc
   $ echo 'evolution=!' >> server/.hg/hgrc
@@ -161,7 +161,7 @@
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ hg debugpushkey http://localhost:$HGPORT namespaces
   bookmarks	
   namespaces	
   phases	
@@ -171,9 +171,9 @@
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ hg debugpushkey http://localhost:$HGPORT namespaces
   bookmarks	
   namespaces	
   obsolete	
   phases	
 
@@ -175,7 +175,7 @@
   bookmarks	
   namespaces	
   obsolete	
   phases	
 
-  $ curl -s http://localhost:$HGPORT/?cmd=hello
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=hello
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
@@ -181,6 +181,6 @@
   capabilities: _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
-  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (no-eol) (glob)
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=capabilities
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch * (glob)
 
 Test obshashrange discover
 ===========================================
diff --git a/tests/test-minitopic.t b/tests/test-minitopic.t
index ad9b2d68a8eeceb0b84d9645a423402cb311c902_dGVzdHMvdGVzdC1taW5pdG9waWMudA==..741d00764d3ba09c10fe93e79bc7993c4810692a_dGVzdHMvdGVzdC1taW5pdG9waWMudA== 100644
--- a/tests/test-minitopic.t
+++ b/tests/test-minitopic.t
@@ -45,5 +45,5 @@
   $ hg serve -R server-disabled -p $HGPORT2 -d --pid-file hg2.pid --errorlog hg2.error
   $ cat hg2.pid >> $DAEMON_PIDS
 
-  $ curl --silent http://localhost:$HGPORT/?cmd=capabilities | grep -o topics
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=capabilities | grep -o topics
   topics
@@ -49,5 +49,5 @@
   topics
-  $ curl --silent http://localhost:$HGPORT2/?cmd=capabilities | grep -o topics
+  $ hg debugdownload http://localhost:$HGPORT2/?cmd=capabilities | grep -o topics
   [1]
 
 Pushing first changesets to the servers
@@ -95,5 +95,5 @@
   (merge or see 'hg help push' for details about pushing new heads)
   [255]
 
-  $ curl --silent http://localhost:$HGPORT/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort
   default 0ab6d544d0efd629fda056601cfe95e73d1af210
@@ -99,5 +99,5 @@
   default 0ab6d544d0efd629fda056601cfe95e73d1af210
-  $ curl --silent http://localhost:$HGPORT2/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT2/?cmd=branchmap | sort
   default 0ab6d544d0efd629fda056601cfe95e73d1af210
   $ cat $TESTTMP/hg1.error
   $ cat $TESTTMP/hg2.error
@@ -162,6 +162,6 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
 
-  $ curl --silent http://localhost:$HGPORT/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort
   default 9c660cf97499ae01ccb6894880455c6ffa4b19cf
   default%3Atopic_A f31af349535e413b6023f11b51a6afccf4139180
@@ -166,6 +166,6 @@
   default 9c660cf97499ae01ccb6894880455c6ffa4b19cf
   default%3Atopic_A f31af349535e413b6023f11b51a6afccf4139180
-  $ curl --silent http://localhost:$HGPORT2/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT2/?cmd=branchmap | sort
   default 9c660cf97499ae01ccb6894880455c6ffa4b19cf f31af349535e413b6023f11b51a6afccf4139180
   $ cat $TESTTMP/hg1.error
   $ cat $TESTTMP/hg2.error
@@ -231,6 +231,6 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
 
-  $ curl --silent http://localhost:$HGPORT/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT/?cmd=branchmap | sort
   default 9c660cf97499ae01ccb6894880455c6ffa4b19cf
   default%3Atopic_A f31af349535e413b6023f11b51a6afccf4139180 82c5842e047215160763f81ae93ae42c65b20a63
@@ -235,6 +235,6 @@
   default 9c660cf97499ae01ccb6894880455c6ffa4b19cf
   default%3Atopic_A f31af349535e413b6023f11b51a6afccf4139180 82c5842e047215160763f81ae93ae42c65b20a63
-  $ curl --silent http://localhost:$HGPORT2/?cmd=branchmap | sort
+  $ hg debugdownload http://localhost:$HGPORT2/?cmd=branchmap | sort
   default f31af349535e413b6023f11b51a6afccf4139180 82c5842e047215160763f81ae93ae42c65b20a63
   $ cat $TESTTMP/hg1.error
   $ cat $TESTTMP/hg2.error
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
index ad9b2d68a8eeceb0b84d9645a423402cb311c902_dGVzdHMvdGVzdC13aXJlcHJvdG8udA==..741d00764d3ba09c10fe93e79bc7993c4810692a_dGVzdHMvdGVzdC13aXJlcHJvdG8udA== 100644
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -194,8 +194,9 @@
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log  --config experimental.evolution.obsdiscovery=no
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Acheckheads%3Drelated%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+  $ hg debugcapabilities http://localhost:$HGPORT | grep _evoext
+    _evoext_getbundle_obscommon
+    _evoext_obshashrange_v1
 
 Check we cannot use pushkey for marker exchange anymore