With proper use of conditional addtask within python code we should be able to merge testimage-auto.bbclass and testimage.bbclass.
This has now been implemented: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=fae0a9a4397e2878c2642a38ce82ec18fe60bc5a