One other thing that makes noise measurements easier is a good, stable noise source that can serve as a reference: you first measure your amplifier without any input, and then measure it again ...