http://www.fightingrobots.co.uk/documents/emi.pdfhttp://www.fightingrobots.co.uk/documents/emi.pdf

10 nf max across between the motor terminals ...page 4 / 5

There is LOADS of other info in the document that should help you solve your problems.