diff --git a/runastyle b/runastyle
index 0a2cfe5c7..7d5c6c0d2 100755
--- a/runastyle
+++ b/runastyle
@@ -29,7 +29,8 @@ $ASTYLE $style $options -r gui/test/*.h
 $ASTYLE $style $options lib/*.cpp
 $ASTYLE $style $options lib/*.h
 $ASTYLE $style $options test/*.cpp
-$ASTYLE $style $options test/cfg/{std,qt,windows,wxwidgets,posix,gnu,gtk}.c* # Exclude generated test files
+$ASTYLE $style $options test/cfg/*.c
+$ASTYLE $style $options test/cfg/*.cpp
 $ASTYLE $style $options test/*.h
 
 $ASTYLE $style $options --recursive "tools/*.cpp"
diff --git a/runastyle.bat b/runastyle.bat
index 7dd8ff6eb..9b28eae59 100644
--- a/runastyle.bat
+++ b/runastyle.bat
@@ -32,7 +32,8 @@
 %ASTYLE% %STYLE% %OPTIONS% lib/*.cpp
 %ASTYLE% %STYLE% %OPTIONS% lib/*.h
 %ASTYLE% %STYLE% %OPTIONS% test/*.cpp
-%ASTYLE% %STYLE% %OPTIONS% test/cfg/*.c*
+%ASTYLE% %STYLE% %OPTIONS% test/cfg/*.c
+%ASTYLE% %STYLE% %OPTIONS% test/cfg/*.cpp
 %ASTYLE% %STYLE% %OPTIONS% test/*.h
 
 %ASTYLE% %STYLE% %OPTIONS% -r tools/*.cpp