Try using Dieharder. It incorporates most of the Diehard tests, as well as other tests and is much more rigorous.

sudo apt-get install dieharder

http://www.phy.duke.edu/~rgb/General/dieharder.php

If you make a GSL interface for the RNG it will make using dieharder much easier