2.6 fix in self_test