FIX: Conditional testing for fixing 2.6 issues