diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java
index edb210ad5..c5a6338ce 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java
@@ -357,17 +357,7 @@ public class FeaturesTest extends HqlQueryBase<FeaturesTest>{
         toString("cat.name like :a1",cat.name.like("A%"));
         toString("lower(cat.name)",cat.name.lower());
     }
-    
-    @Test
-    @Ignore
-    public void testSubQuery(){
-        // TODO : make the comparison work again
-        StringBuilder b = new StringBuilder();
-        b.append("(select cust.name from cust");
-        b.append(" where cust.name is not null)");
-        toString(b.toString(), HqlGrammar.select(cust.name).from(cust).where(cust.name.isnotnull()));
-    }
-    
+        
     @Test
     public void testToString(){
         toString("cat", cat);
diff --git a/querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java b/querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java
index fe717c434..02e1dac65 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java
@@ -5,6 +5,7 @@
  */
 package com.mysema.query.util;
 
+import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Properties;
 
@@ -62,8 +63,9 @@ public class HibernateTestRunner extends JUnit4ClassRunner{
             Hibernate config = getTestClass().getJavaClass().getAnnotation(Hibernate.class);            
             cfg.setNamingStrategy(config.namingStrategy().newInstance());
             Properties props = new Properties();
-            // TODO : null check and error message
-            props.load(HqlIntegrationTest.class.getResourceAsStream(config.properties()));
+            InputStream is = HqlIntegrationTest.class.getResourceAsStream(config.properties());
+            if (is == null) throw new IllegalArgumentException("No configuration available at classpath:" + config.properties());
+            props.load(is);
             cfg.setProperties(props);
             sessionFactory = cfg.buildSessionFactory();    
             super.run(notifier);