This patch is a fix for revision ce0c1f3c, which caused test failures on bots without x86 as a registered target. This patch moves the test added in the prior patch to the x86 folder, so that it only runs on bots with the correct target available.