diff --git a/krita/plugins/formats/psd/tests/kis_psd_test.cpp b/krita/plugins/formats/psd/tests/kis_psd_test.cpp
index d8a0f70dbe4..ce49d970fa9 100644
--- a/krita/plugins/formats/psd/tests/kis_psd_test.cpp
+++ b/krita/plugins/formats/psd/tests/kis_psd_test.cpp
@@ -1,103 +1,114 @@
 /*
  * Copyright (C) 2009 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_psd_test.h"
 
 
 #include <QTest>
 #include <QCoreApplication>
 
 #include <qtest_kde.h>
 
 #include "filestest.h"
 
 #ifndef FILES_DATA_DIR
 #error "FILES_DATA_DIR not set. A directory with the data used for testing the importing of files in krita"
 #endif
 
 
 void KisPSDTest::testFiles()
 {
     TestUtil::testFiles(QString(FILES_DATA_DIR) + "/sources", QStringList());
 }
 
 void KisPSDTest::testOpening()
 {
     QFileInfo sourceFileInfo(QString(FILES_DATA_DIR) + QDir::separator() + "testing_psd_ls.psd");
 
     QScopedPointer<KisDocument> doc(qobject_cast<KisDocument*>(KisPart::instance()->createDocument()));
 
     KisImportExportManager manager(doc.data());
     manager.setBatchMode(true);
 
     KisImportExportFilter::ConversionStatus status;
     QString s = manager.importDocument(sourceFileInfo.absoluteFilePath(), QString(),
                                        status);
     qDebug() << s;
 
     Q_ASSERT(doc->image());
 }
 
 QSharedPointer<KisDocument> openPsdDocument(const QFileInfo &fileInfo)
 {
     QSharedPointer<KisDocument> doc(qobject_cast<KisDocument*>(KisPart::instance()->createDocument()));
 
     KisImportExportManager manager(doc.data());
     manager.setBatchMode(true);
 
     KisImportExportFilter::ConversionStatus status;
     QString s = manager.importDocument(fileInfo.absoluteFilePath(), QString(),
                                        status);
 
     return doc;
 }
 
 void KisPSDTest::testTransparencyMask()
 {
     QFileInfo sourceFileInfo(QString(FILES_DATA_DIR) + QDir::separator() + "sources/masks.psd");
 
     Q_ASSERT(sourceFileInfo.exists());
 
     QSharedPointer<KisDocument> doc = openPsdDocument(sourceFileInfo);
     QVERIFY(doc->image());
 
     QImage result = doc->image()->projection()->convertToQImage(0, doc->image()->bounds());
     QVERIFY(TestUtil::checkQImageExternal(result, "psd_test", "transparency_masks", "kiki_single"));
 
     doc->setBackupFile(false);
     doc->setOutputMimeType("image/vnd.adobe.photoshop");
     QFileInfo dstFileInfo(QDir::currentPath() + QDir::separator() + "test_tmask.psd");
     bool retval = doc->saveAs(KUrl(dstFileInfo.absoluteFilePath()));
     QVERIFY(retval);
 
     {
         QSharedPointer<KisDocument> doc = openPsdDocument(sourceFileInfo);
         QVERIFY(doc->image());
 
         QImage result = doc->image()->projection()->convertToQImage(0, doc->image()->bounds());
         QVERIFY(TestUtil::checkQImageExternal(result, "psd_test", "transparency_masks", "kiki_single"));
 
         QVERIFY(doc->image()->root()->lastChild());
         QVERIFY(doc->image()->root()->lastChild()->firstChild());
         QVERIFY(doc->image()->root()->lastChild()->firstChild()->inherits("KisTransparencyMask"));
     }
 }
 
+void KisPSDTest::testOpenGrayscaleMultilayered()
+{
+    QFileInfo sourceFileInfo(QString(FILES_DATA_DIR) + QDir::separator() + "sources/gray.psd");
+    //QFileInfo sourceFileInfo(QString(FILES_DATA_DIR) + QDir::separator() + "sources/100x100gray8.psd");
+
+    Q_ASSERT(sourceFileInfo.exists());
+
+    QSharedPointer<KisDocument> doc = openPsdDocument(sourceFileInfo);
+    QVERIFY(doc->image());
+}
+
 QTEST_KDEMAIN(KisPSDTest, GUI)
 
 #include "kis_psd_test.moc"
diff --git a/krita/plugins/formats/psd/tests/kis_psd_test.h b/krita/plugins/formats/psd/tests/kis_psd_test.h
index 5ce3893e448..217234a59b1 100644
--- a/krita/plugins/formats/psd/tests/kis_psd_test.h
+++ b/krita/plugins/formats/psd/tests/kis_psd_test.h
@@ -1,33 +1,34 @@
 /*
  * Copyright (C) 2009 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef _KIS_PSD_TEST_H_
 #define _KIS_PSD_TEST_H_
 
 #include <QObject>
 
 class KisPSDTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void testFiles();
     void testOpening();
     void testTransparencyMask();
+    void testOpenGrayscaleMultilayered();
 };
 
 #endif