diff --git a/test/framework/options.py b/test/framework/options.py
index 4b561d9b2f..35aa9c1e39 100644
--- a/test/framework/options.py
+++ b/test/framework/options.py
@@ -4061,7 +4061,13 @@ def test_github_xxx_include_easyblocks_from_pr(self):
         self.assertTrue(issubclass(klass, EasyBlock), "%s is an EasyBlock derivative class" % klass)
 
         # 'undo' import of easyblocks
-        del sys.modules['easybuild.easyblocks.xcrysden']
+        del sys.modules['easybuild.easyblocks.gromacs']
+        del sys.modules['easybuild.easyblocks.generic.configuremake']
+        sys.path[:] = orig_local_sys_path
+        import easybuild.easyblocks
+        reload(easybuild.easyblocks)
+        import easybuild.easyblocks.generic
+        reload(easybuild.easyblocks.generic)
 
     def mk_eb_test_cmd(self, args):
         """Construct test command for 'eb' with given options."""