diff --git a/messagecomposer/autotests/setupenv.cpp b/messagecomposer/autotests/setupenv.cpp
index ab5611b3..62f431e5 100644
--- a/messagecomposer/autotests/setupenv.cpp
+++ b/messagecomposer/autotests/setupenv.cpp
@@ -1,74 +1,76 @@
 /*
   Copyright (C) 2010 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
   Copyright (c) 2010 Leo Franchi <lfranchi@kde.org>
 
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public License as published by
   the Free Software Foundation; either version 2 of the License, or (at your
   option) any later version.
 
   This library is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
   License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to the
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
   02110-1301, USA.
 */
 
 #include "setupenv.h"
 
 #include <QGpgME/Protocol>
 #include <QGpgME/KeyListJob>
 #include <gpgme++/keylistresult.h>
 
 #include <QFile>
 #include <QDir>
 
-void MessageComposer::Test::setupEnv()
+using namespace MessageComposer;
+
+void Test::setupEnv()
 {
     qputenv("LC_ALL", "C");
     qputenv("KDEHOME", QFile::encodeName(QDir::homePath() + QLatin1String("/.qttest")).constData());
     QStandardPaths::setTestModeEnabled(true);
 }
 
-std::vector< GpgME::Key, std::allocator< GpgME::Key > > MessageComposer::Test::getKeys(bool smime)
+std::vector< GpgME::Key, std::allocator< GpgME::Key > > Test::getKeys(bool smime)
 {
     QGpgME::KeyListJob *job = nullptr;
 
     if (smime) {
         const QGpgME::Protocol *const backend = QGpgME::smime();
         Q_ASSERT(backend);
         job = backend->keyListJob(false);
     } else {
         const QGpgME::Protocol *const backend = QGpgME::openpgp();
         Q_ASSERT(backend);
         job = backend->keyListJob(false);
     }
     Q_ASSERT(job);
 
     std::vector< GpgME::Key > keys;
     GpgME::KeyListResult res = job->exec(QStringList(), true, keys);
 
     if (!smime) {
         Q_ASSERT(keys.size() == 3);
     }
 
     Q_ASSERT(!res.error());
 
     /*
     qDebug() << "got private keys:" << keys.size();
 
     for (std::vector< GpgME::Key >::iterator i = keys.begin(); i != keys.end(); ++i) {
         qDebug() << "key isnull:" << i->isNull() << "isexpired:" << i->isExpired();
         qDebug() << "key numuserIds:" << i->numUserIDs();
         for (uint k = 0; k < i->numUserIDs(); ++k) {
             qDebug() << "userIDs:" << i->userID(k).email();
         }
     }
     */
 
     return keys;
 }