diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8392cd1701..84f8f6cfd7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,6 @@ src/frontends/qt4/Alert_pimpl.C
 src/frontends/qt4/BulletsModule.C
 src/frontends/qt4/Dialogs.C
 src/frontends/qt4/FileDialog.C
-src/frontends/qt4/GuiApplication.C
 src/frontends/qt4/GuiView.C
 src/frontends/qt4/GuiWorkArea.C
 src/frontends/qt4/QAbout.C
@@ -92,6 +91,7 @@ src/insets/insetbox.C
 src/insets/insetbranch.C
 src/insets/insetcaption.C
 src/insets/insetcharstyle.C
+src/insets/insetcommand.C
 src/insets/insetenv.C
 src/insets/insetert.C
 src/insets/insetexternal.C
diff --git a/src/support/tests/Makefile.am b/src/support/tests/Makefile.am
index 4b49c145b5..04168ac27d 100644
--- a/src/support/tests/Makefile.am
+++ b/src/support/tests/Makefile.am
@@ -14,9 +14,11 @@ check_PROGRAMS = \
 	filetools \
 	lstrings
 
-AM_CPPFLAGS += $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(BOOST_INCLUDES) -I$(srcdir)/../..
 
-convert_LDADD = ../convert.o
+
+convert_LDADD = ../../debug.o ../convert.o ../docstring.o ../lstrings.o ../unicode.o ../qstring_helpers.o $(BOOST_REGEX) $(QT4_CORE_LIB)
+convert_LDFLAGS = $(QT4_CORE_LDFLAGS)
 convert_SOURCES = \
 	convert.C \
 	boost.C
@@ -26,7 +28,8 @@ filetools_SOURCES = \
 	filetools.C \
 	boost.C
 
-lstrings_LDADD = ../lstrings.o
+lstrings_LDADD = ../../debug.o ../lstrings.o ../convert.o ../docstring.o ../unicode.o ../qstring_helpers.o $(QT4_CORE_LIB)
+lstrings_LDFLAGS = $(QT4_CORE_LDFLAGS)
 lstrings_SOURCES = \
 	lstrings.C \
 	boost.C
diff --git a/src/support/tests/convert.C b/src/support/tests/convert.C
index d8033201dd..7854a30e91 100644
--- a/src/support/tests/convert.C
+++ b/src/support/tests/convert.C
@@ -1,6 +1,7 @@
 #include <config.h>
 
 #include "../convert.h"
+#include "../docstring.h"
 
 #include <iostream>
 
@@ -8,6 +9,12 @@ using lyx::convert;
 
 using namespace std;
 
+
+namespace lyx {
+	docstring const _(string const & s) { return from_ascii(s); }
+}
+
+
 void convert_int()
 {
 	cout << convert<int>("123") << '\n'
diff --git a/src/support/tests/filetools.C b/src/support/tests/filetools.C
index 058d16d323..4859f8db18 100644
--- a/src/support/tests/filetools.C
+++ b/src/support/tests/filetools.C
@@ -7,9 +7,8 @@ using namespace lyx::support;
 
 using namespace std;
 
-string _(string const & str)
-{
-	return str;
+namespace lyx {
+	docstring const _(string const & s) { return from_ascii(s); }
 }
 
 void test_normalizePath()
diff --git a/src/support/tests/lstrings.C b/src/support/tests/lstrings.C
index 0f173ba36a..998deafec0 100644
--- a/src/support/tests/lstrings.C
+++ b/src/support/tests/lstrings.C
@@ -7,6 +7,10 @@ using namespace lyx::support;
 
 using namespace std;
 
+namespace lyx {
+	docstring const _(string const & s) { return from_ascii(s); }
+}
+
 void test_lowercase()
 {
 	cout << lowercase('A') << endl;