Test categories are in master and new unit tests are sometimes marked with that particular interface ( RPCTests.class ).
Since we don't have the specific annotation classes in branch-1, backports usually fail. We can just commit those classes to all applicable branches so that committing patches is less work.
We can also backport the full patch for running the specific tests from maven as a further issue. Feel free to take it up, if you are interested.