I would wait and see how school starts out before you borrow trouble. Maybe he will have a fabulous kindergarten teacher who will provide just what he needs, or maybe he will get one who is having trouble remembering his name until Thanksgiving. Also, my understanding (I'm sure aeh will be along to confirm) is that there are more test instruments available after he turns 6.