Attempt to fix bug 681138 by making the test loading not race against snapshotting