Probably been mentioned before, but I can't find it, BT Wholesale has a whizzy new speed test website design:
https://speedtest.btwholesale.com
There's an 'and' rather than an 'or' (as in ADSL OR FTTC) in the Enter service tag or phone number section for Additional Diagnostics. But at least it seems to work!