Depends on the actual motor you are using but in days gone by we used to use a bunch of Mabuchi 540 sized motors for earlier R/C electric aircraft. At 6 or 7 cells (circa 7-8V fully loaded) and 20-25 amps the sparking wasn't to bad but push that to 12 and it became horrid. Typically we ran three Caps, the two lower ones to the can and the third between the terminals to reduce it. We did also run more upmarket larger Can brushed motors to around 30V and 50-60A but they were a very different beast in price and build quality, still used a similar capacitor filter on the backend as the smaller ones.
Are you running a filter on your CRO input? If not a lot of the high frequency hash will also be coming from your supply in your readings.