diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 1b54b0d2..a2de70af 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -12,6 +12,9 @@ target_link_libraries(PtyTest ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS})
 kde4_add_unit_test(ShellCommandTest ShellCommandTest.cpp)
 target_link_libraries(ShellCommandTest ${KONSOLE_TEST_LIBS})
 
+kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp)
+target_link_libraries(CharacterColorTest ${KONSOLE_TEST_LIBS})
+
 kde4_add_unit_test(ProfileTest ProfileTest.cpp)
 target_link_libraries(ProfileTest ${KONSOLE_TEST_LIBS})
 
diff --git a/src/tests/CharacterColorTest.cpp b/src/tests/CharacterColorTest.cpp
new file mode 100644
index 00000000..3c42f154
--- /dev/null
+++ b/src/tests/CharacterColorTest.cpp
@@ -0,0 +1,120 @@
+/*
+    Copyright 2008 by Robert Knight <robertknight@gmail.com>
+
+    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.
+*/
+
+// Own
+#include "CharacterColorTest.h"
+
+// Qt
+#include <QtCore/QSize>
+#include <QtCore/QStringList>
+
+// KDE
+#include <qtest_kde.h>
+
+using namespace Konsole;
+
+const ColorEntry CharacterColorTest::DefaultColorTable[TABLE_COLORS] =
+{
+    ColorEntry(QColor(0x00, 0x00, 0x00)), // Dfore
+    ColorEntry(QColor(0xFF, 0xFF, 0xFF)), // Dback
+    ColorEntry(QColor(0x00, 0x00, 0x00)), // Black
+    ColorEntry(QColor(0xB2, 0x18, 0x18)), // Red
+    ColorEntry(QColor(0x18, 0xB2, 0x18)), // Green
+    ColorEntry(QColor(0xB2, 0x68, 0x18)), // Yellow
+    ColorEntry(QColor(0x18, 0x18, 0xB2)), // Blue
+    ColorEntry(QColor(0xB2, 0x18, 0xB2)), // Magenta
+    ColorEntry(QColor(0x18, 0xB2, 0xB2)), // Cyan
+    ColorEntry(QColor(0xB2, 0xB2, 0xB2)), // White
+    // intensive versions
+    ColorEntry(QColor(0x00, 0x00, 0x00)),
+    ColorEntry(QColor(0xFF, 0xFF, 0xFF)),
+    ColorEntry(QColor(0x68, 0x68, 0x68)),
+    ColorEntry(QColor(0xFF, 0x54, 0x54)),
+    ColorEntry(QColor(0x54, 0xFF, 0x54)),
+    ColorEntry(QColor(0xFF, 0xFF, 0x54)),
+    ColorEntry(QColor(0x54, 0x54, 0xFF)),
+    ColorEntry(QColor(0xFF, 0x54, 0xFF)),
+    ColorEntry(QColor(0x54, 0xFF, 0xFF)),
+    ColorEntry(QColor(0xFF, 0xFF, 0xFF))
+};
+
+void CharacterColorTest::init()
+{
+}
+
+void CharacterColorTest::cleanup()
+{
+}
+
+void CharacterColorTest::testDummyConstructor()
+{
+    CharacterColor charColor;
+    QCOMPARE(charColor.isValid(), false);
+}
+
+void CharacterColorTest::testColorSpaceDefault_data()
+{
+     QTest::addColumn<int>("colorValue");
+     QTest::addColumn<QColor>("expected");
+
+     QTest::newRow("color 0") << 0 << DefaultColorTable[0].color;
+     QTest::newRow("color 1") << 1 << DefaultColorTable[1].color;
+}
+
+void CharacterColorTest::testColorSpaceDefault()
+{
+    QFETCH(int, colorValue);
+    QFETCH(QColor, expected);
+
+    CharacterColor charColor(COLOR_SPACE_DEFAULT, colorValue);
+    const QColor result = charColor.color(DefaultColorTable);
+
+    QCOMPARE(result, expected);
+}
+
+void CharacterColorTest::testColorSpaceSystem_data()
+{
+     QTest::addColumn<int>("colorValue");
+     QTest::addColumn<QColor>("expected");
+
+     QTest::newRow("color 0") << 0 << DefaultColorTable[2+0].color;
+     QTest::newRow("color 1") << 1 << DefaultColorTable[2+1].color;
+     QTest::newRow("color 7") << 7 << DefaultColorTable[2+7].color;
+}
+
+void CharacterColorTest::testColorSpaceSystem()
+{
+    QFETCH(int, colorValue);
+    QFETCH(QColor, expected);
+
+    CharacterColor charColor(COLOR_SPACE_SYSTEM, colorValue);
+    const QColor result = charColor.color(DefaultColorTable);
+
+    QCOMPARE(result, expected);
+
+    //CharacterColor charColor(COLOR_SPACE_SYSTEM, 5);
+    //const QColor result = charColor.color(DefaultColorTable);
+    //const QColor expected = DefaultColorTable[7].color;
+    //QCOMPARE(result, expected);
+}
+
+QTEST_KDEMAIN_CORE(CharacterColorTest)
+
+#include "CharacterColorTest.moc"
+
diff --git a/src/tests/CharacterColorTest.h b/src/tests/CharacterColorTest.h
new file mode 100644
index 00000000..bc2d13e6
--- /dev/null
+++ b/src/tests/CharacterColorTest.h
@@ -0,0 +1,49 @@
+/*
+    Copyright 2008 by Robert Knight <robertknight@gmail.com>
+
+    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 CHARACTERCOLORTEST_H
+#define CHARACTERCOLORTEST_H
+
+#include "../CharacterColor.h"
+
+namespace Konsole
+{
+
+class CharacterColorTest : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void init();
+    void cleanup();
+
+    void testDummyConstructor();
+    void testColorSpaceDefault_data();
+    void testColorSpaceDefault();
+    void testColorSpaceSystem_data();
+    void testColorSpaceSystem();
+
+private:
+    static const ColorEntry DefaultColorTable[];
+};
+
+}
+
+#endif // CHARACTERCOLORTEST_H
+