Upstream: 9f68ed6b6d1a9c6436ce37913666165f2b180ee3 (PR #6539)
* move non-test classes to subdir `test-framework`