Partial fix for test_wpa build