diff --git a/autotests/libkwineffects/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399 b/autotests/libkwineffects/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399
new file mode 100644
index 0000000000..a768214571
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-catalyst-radeonhd-7700M-3.1.13399
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=ATI Technologies Inc.
+Renderer=AMD Radeon HD 7700M Series
+Version=3.1.13399 Compatibility Profile Context FireGL 15.201.1151
+ShadingLanguageVersion=4.40
+
+[Settings]
+LooseBinding=false
+GLSL=true
+TextureNPOT=true
+Catalyst=true
+Radeon=true
+GLVersion=3,1,13399
+GLSLVersion=4,40
+DriverVersion=15,201,1151
+Driver=9
+ChipClass=999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-bonaire-3.0 b/autotests/libkwineffects/data/glplatform/amd-gallium-bonaire-3.0
new file mode 100644
index 0000000000..e570fe322f
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-gallium-bonaire-3.0
@@ -0,0 +1,21 @@
+[Driver]
+Vendor=X.Org
+Renderer=Gallium 0.4 on AMD BONAIRE (DRM 2.43.0, LLVM 3.8.0)
+Version=3.0 Mesa 11.2.2
+ShadingLanguageVersion=1.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+Radeon=true
+GLVersion=3,0
+GLSLVersion=1,30
+MesaVersion=11,2,2
+GalliumVersion=0,4
+DriverVersion=11,2,2
+Driver=5
+ChipClass=999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-cayman-gles-3.0 b/autotests/libkwineffects/data/glplatform/amd-gallium-cayman-gles-3.0
new file mode 100644
index 0000000000..4656c8cdd7
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-gallium-cayman-gles-3.0
@@ -0,0 +1,22 @@
+[Driver]
+Vendor=X.Org
+Renderer=Gallium 0.4 on AMD CAYMAN (DRM 2.43.0, LLVM 3.8.0)
+Version=OpenGL ES 3.0 Mesa 11.2.2
+ShadingLanguageVersion=OpenGL ES GLSL ES 3.00
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+Radeon=true
+GLVersion=3,0
+GLSLVersion=3,0
+GLES=true
+MesaVersion=11,2,2
+GalliumVersion=0,4
+DriverVersion=11,2,2
+Driver=5
+ChipClass=8
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-hawaii-3.0 b/autotests/libkwineffects/data/glplatform/amd-gallium-hawaii-3.0
new file mode 100644
index 0000000000..35e275d45f
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-gallium-hawaii-3.0
@@ -0,0 +1,21 @@
+[Driver]
+Vendor=X.Org
+Renderer=Gallium 0.4 on AMD HAWAII (DRM 2.43.0, LLVM 3.7.1)
+Version=3.0 Mesa 11.1.2
+ShadingLanguageVersion=1.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+Radeon=true
+GLVersion=3,0
+GLSLVersion=1,30
+MesaVersion=11,1,2
+GalliumVersion=0,4
+DriverVersion=11,1,2
+Driver=5
+ChipClass=999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-redwood-3.0 b/autotests/libkwineffects/data/glplatform/amd-gallium-redwood-3.0
new file mode 100644
index 0000000000..9dd8fe3650
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-gallium-redwood-3.0
@@ -0,0 +1,21 @@
+[Driver]
+Vendor=X.Org
+Renderer=Gallium 0.4 on AMD REDWOOD (DRM 2.43.0 / 4.6.4-1-ARCH, LLVM 3.8.0)
+Version=3.0 Mesa 12.0.1
+ShadingLanguageVersion=1.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+Radeon=true
+GLVersion=3,0
+GLSLVersion=1,30
+MesaVersion=12,0,1
+GalliumVersion=0,4
+DriverVersion=12,0,1
+Driver=5
+ChipClass=7
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/amd-gallium-tonga-4.1 b/autotests/libkwineffects/data/glplatform/amd-gallium-tonga-4.1
new file mode 100644
index 0000000000..a20045e1fc
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/amd-gallium-tonga-4.1
@@ -0,0 +1,21 @@
+[Driver]
+Vendor=X.Org
+Renderer=Gallium 0.4 on AMD TONGA (DRM 3.2.0 / 4.7.0-0-MANJARO, LLVM 3.8.0)
+Version=4.1 (Core Profile) Mesa 12.0.1
+ShadingLanguageVersion=4.10
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Gallium=true
+Radeon=true
+GLVersion=4,1
+GLSLVersion=4,10
+MesaVersion=12,0,1
+GalliumVersion=0,4
+DriverVersion=12,0,1
+Driver=5
+ChipClass=999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/intel-broadwell-gt2-3.3 b/autotests/libkwineffects/data/glplatform/intel-broadwell-gt2-3.3
new file mode 100644
index 0000000000..1bdb0b83ef
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/intel-broadwell-gt2-3.3
@@ -0,0 +1,19 @@
+[Driver]
+Vendor=Intel Open Source Technology Center
+Renderer=Mesa DRI Intel(R) HD Graphics 5500 (Broadwell GT2)
+Version=3.3 (Core Profile) Mesa 11.2.2
+ShadingLanguageVersion=3.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Intel=true
+GLVersion=3,3
+GLSLVersion=3,30
+MesaVersion=11,2,2
+DriverVersion=11,2,2
+Driver=7
+ChipClass=2999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/intel-haswell-mobile-3.3 b/autotests/libkwineffects/data/glplatform/intel-haswell-mobile-3.3
new file mode 100644
index 0000000000..7b7e52cbae
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/intel-haswell-mobile-3.3
@@ -0,0 +1,19 @@
+[Driver]
+Vendor=Intel Open Source Technology Center
+Renderer=Mesa DRI Intel(R) Haswell Mobile
+Version=3.3 (Core Profile) Mesa 11.2.2
+ShadingLanguageVersion=3.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Intel=true
+GLVersion=3,3
+GLSLVersion=3,30
+MesaVersion=11,2,2
+DriverVersion=11,2,2
+Driver=7
+ChipClass=2005
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.0 b/autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.0
new file mode 100644
index 0000000000..7629c0b36d
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/intel-ivybridge-desktop-3.0
@@ -0,0 +1,20 @@
+[Driver]
+Vendor=Intel Open Source Technology Center
+Renderer=Mesa DRI Intel(R) Ivybridge Desktop
+Version=3.0 Mesa 11.1.0 (git-525f3c2)
+ShadingLanguageVersion=1.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Intel=true
+GLVersion=3,0
+GLSLVersion=1,30
+MesaVersion=11,1,0
+DriverVersion=11,1,0
+Driver=7
+ChipClass=2004
+Compositor=9
+
diff --git a/autotests/libkwineffects/data/glplatform/intel-ivybridge-mobile-3.3 b/autotests/libkwineffects/data/glplatform/intel-ivybridge-mobile-3.3
new file mode 100644
index 0000000000..ef2fdda15f
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/intel-ivybridge-mobile-3.3
@@ -0,0 +1,19 @@
+[Driver]
+Vendor=Intel Open Source Technology Center
+Renderer=Mesa DRI Intel(R) Ivybridge Mobile
+Version=3.3 (Core Profile) Mesa 12.0.1
+ShadingLanguageVersion=3.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Intel=true
+GLVersion=3,3
+GLSLVersion=3,30
+MesaVersion=12,0,1
+DriverVersion=12,0,1
+Driver=7
+ChipClass=2004
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/intel-sandybridge-mobile-3.3 b/autotests/libkwineffects/data/glplatform/intel-sandybridge-mobile-3.3
new file mode 100644
index 0000000000..8921490145
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/intel-sandybridge-mobile-3.3
@@ -0,0 +1,19 @@
+[Driver]
+Vendor=Intel Open Source Technology Center
+Renderer=Mesa DRI Intel(R) Sandybridge Mobile
+Version=3.3 (Core Profile) Mesa 12.0.1
+ShadingLanguageVersion=3.30
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Mesa=true
+Intel=true
+GLVersion=3,3
+GLSLVersion=3,30
+MesaVersion=12,0,1
+DriverVersion=12,0,1
+Driver=7
+ChipClass=2003
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-560-4.5 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-560-4.5
new file mode 100644
index 0000000000..4c92365c45
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-560-4.5
@@ -0,0 +1,19 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 560/PCIe/SSE2
+Version=4.5.0 NVIDIA 361.28
+ShadingLanguageVersion=4.50 NVIDIA
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=4,5
+GLSLVersion=4,50
+DriverVersion=361,28
+Driver=8
+ChipClass=1005
+Compositor=9
+
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-660-3.1 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-660-3.1
new file mode 100644
index 0000000000..12e769ce6f
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-660-3.1
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 660/PCIe/SSE2
+Version=3.1.0 NVIDIA 367.27
+ShadingLanguageVersion=1.40 NVIDIA via Cg compiler
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=3,1
+GLSLVersion=1,40
+DriverVersion=367,27
+Driver=8
+ChipClass=1999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-950-4.5 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-950-4.5
new file mode 100644
index 0000000000..6e010f406a
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-950-4.5
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 950/PCIe/SSE2
+Version=4.5.0 NVIDIA 364.19
+ShadingLanguageVersion=4.50 NVIDIA
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=4,5
+GLSLVersion=4,50
+DriverVersion=364,19
+Driver=8
+ChipClass=1999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970-3.1 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970-3.1
new file mode 100644
index 0000000000..eee24d6b41
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970-3.1
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 970/PCIe/SSE2
+Version=3.1.0 NVIDIA 367.35
+ShadingLanguageVersion=1.40 NVIDIA via Cg compiler
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=3,1
+GLSLVersion=1,40
+DriverVersion=367,35
+Driver=8
+ChipClass=1999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970M-3.1 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970M-3.1
new file mode 100644
index 0000000000..069dc95f3d
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-970M-3.1
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 970M/PCIe/SSE2
+Version=3.1.0 NVIDIA 364.12
+ShadingLanguageVersion=1.40 NVIDIA via Cg compiler
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=3,1
+GLSLVersion=1,40
+DriverVersion=364,12
+Driver=8
+ChipClass=1999
+Compositor=9
diff --git a/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-980-3.1 b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-980-3.1
new file mode 100644
index 0000000000..ad53428f84
--- /dev/null
+++ b/autotests/libkwineffects/data/glplatform/nvidia-geforce-gtx-980-3.1
@@ -0,0 +1,18 @@
+[Driver]
+Vendor=NVIDIA Corporation
+Renderer=GeForce GTX 980/PCIe/SSE2
+Version=3.1.0 NVIDIA 364.19
+ShadingLanguageVersion=1.40 NVIDIA via Cg compiler
+
+[Settings]
+LooseBinding=true
+GLSL=true
+TextureNPOT=true
+Nvidia=true
+PreferBufferSubData=true
+GLVersion=3,1
+GLSLVersion=1,40
+DriverVersion=364,19
+Driver=8
+ChipClass=1999
+Compositor=9
diff --git a/autotests/libkwineffects/kwinglplatformtest.cpp b/autotests/libkwineffects/kwinglplatformtest.cpp
index 1cd0f03007..484d4e4819 100644
--- a/autotests/libkwineffects/kwinglplatformtest.cpp
+++ b/autotests/libkwineffects/kwinglplatformtest.cpp
@@ -161,13 +161,23 @@ void GLPlatformTest::testDetect()
     QCOMPARE(gl->mesaVersion(), readVersion(settingsGroup, "MesaVersion"));
     QCOMPARE(gl->galliumVersion(), readVersion(settingsGroup, "GalliumVersion"));
     QCOMPARE(gl->serverVersion(), 0);
+    QEXPECT_FAIL("amd-catalyst-radeonhd-7700M-3.1.13399", "Detects GL version instead of driver version", Continue);
     QCOMPARE(gl->driverVersion(), readVersion(settingsGroup, "DriverVersion"));
 
+    QEXPECT_FAIL("amd-gallium-bonaire-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-hawaii-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-tonga-4.1", "Not detected as a radeon driver", Continue);
     QCOMPARE(gl->driver(), Driver(settingsGroup.readEntry("Driver", int(Driver_Unknown))));
+    QEXPECT_FAIL("amd-gallium-bonaire-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-hawaii-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-tonga-4.1", "Not detected as a radeon driver", Continue);
     QCOMPARE(gl->chipClass(), ChipClass(settingsGroup.readEntry("ChipClass", int(UnknownChipClass))));
 
     QCOMPARE(gl->isMesaDriver(), settingsGroup.readEntry("Mesa", false));
     QCOMPARE(gl->isGalliumDriver(), settingsGroup.readEntry("Gallium", false));
+    QEXPECT_FAIL("amd-gallium-bonaire-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-hawaii-3.0", "Not detected as a radeon driver", Continue);
+    QEXPECT_FAIL("amd-gallium-tonga-4.1", "Not detected as a radeon driver", Continue);
     QCOMPARE(gl->isRadeon(), settingsGroup.readEntry("Radeon", false));
     QCOMPARE(gl->isNvidia(), settingsGroup.readEntry("Nvidia", false));
     QCOMPARE(gl->isIntel(), settingsGroup.readEntry("Intel", false));