diff --git a/configure.ac b/configure.ac
index 81344bd..f8abefc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AX_USE_RPM_PACKAGING
 AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
 
+# language requirements
+AX_CXX_COMPILE_STDCXX_11
 export QT_SELECT=5
 AC_SUBST(QT_SELECT)
 
diff --git a/src/commands.hxx b/src/commands.hxx
index 9bf7164..71220f7 100644
--- a/src/commands.hxx
+++ b/src/commands.hxx
@@ -601,9 +601,13 @@ class Script: public QObject {
       for (auto cmd(_script.begin()); cmd!=_script.end(); ++cmd) {
         xml::Node testcase("testcase");
         try {
-          testcase.attr("classname") = xmlattr(_testclass, true).toStdString();
+          testcase.attr("classname") =
+            xmlattr(_testclass.size()?_testclass:(*cmd)->file(), true).toStdString();
           testcase.attr("name") = 
-            xmlattr((*cmd)->command(), true).toStdString();
+            xmlattr(QString("%1: %2")
+                    .arg((*cmd)->line())
+                    .arg((*cmd)->command().split('\n').takeFirst(), true))
+            .toStdString();
           if (!_ignores.size() || (*cmd)->tag()=="label") { // not ignored
             _timer.start(_timeout*1000);
             try {