diff --git a/clang/utils/ABITest/ABITestGen.py b/clang/utils/ABITest/ABITestGen.py
index eb57b7c977de..afe58e58d0ff 100755
--- a/clang/utils/ABITest/ABITestGen.py
+++ b/clang/utils/ABITest/ABITestGen.py
@@ -430,7 +430,7 @@ def main():
                      action="store", type=str, default='v2i16, v1i64, v2i32, v4i16, v8i8, v2f32, v2i64, v4i32, v8i16, v16i8, v2f64, v4f32, v16f32', metavar="N")
     group.add_option("", "--bit-fields", dest="bitFields",
                      help="comma separated list 'type:width' bit-field specifiers [default %default]",
-                     action="store", type=str, default="char:0,char:4,unsigned:0,unsigned:13")
+                     action="store", type=str, default="char:0,char:4,unsigned:0,unsigned:4,unsigned:13,unsigned:24")
     group.add_option("", "--max-args", dest="functionMaxArgs",
                      help="maximum number of arguments per function [default %default]",
                      action="store", type=int, default=4, metavar="N")
diff --git a/clang/utils/ABITest/Makefile.test.common b/clang/utils/ABITest/Makefile.test.common
index db3364605a2c..b7d6b1270743 100644
--- a/clang/utils/ABITest/Makefile.test.common
+++ b/clang/utils/ABITest/Makefile.test.common
@@ -1,5 +1,7 @@
 # -*- Makefile -*-
 
+TESTARGS := --no-unsigned --no-vector --no-complex --no-bool --no-bit-field
+
 ABITESTGEN := ../ABITestGen.py
 
 ifndef VERBOSE
diff --git a/clang/utils/ABITest/return-types-32/Makefile b/clang/utils/ABITest/return-types-32/Makefile
index 0d900587c341..3749f5bfd18a 100644
--- a/clang/utils/ABITest/return-types-32/Makefile
+++ b/clang/utils/ABITest/return-types-32/Makefile
@@ -4,7 +4,6 @@
 # file, and TESTARGS is used to change the type generation. Make sure
 # to 'make clean' after changing either of these parameters.
 
-TESTARGS := --no-vector --no-complex --max-record-depth 0 --bit-fields "char:2,char:0,char:4" --max-args 0 --max-record 2 --no-builtins
 COUNT := 1
 TIMEOUT := 5
 
@@ -21,3 +20,5 @@ Y_CFLAGS := -m32
 CC_CFLAGS := -m32
 
 include ../Makefile.test.common
+
+TESTARGS += --max-args 0
diff --git a/clang/utils/ABITest/return-types-64/Makefile b/clang/utils/ABITest/return-types-64/Makefile
index 2ecb7598aba3..5ad38894b1e6 100644
--- a/clang/utils/ABITest/return-types-64/Makefile
+++ b/clang/utils/ABITest/return-types-64/Makefile
@@ -4,7 +4,6 @@
 # file, and TESTARGS is used to change the type generation. Make sure
 # to 'make clean' after changing either of these parameters.
 
-TESTARGS := --max-args 0 --no-unsigned --no-bit-field
 COUNT := 1
 TIMEOUT := 5
 
@@ -21,3 +20,5 @@ Y_CFLAGS := -m64
 CC_CFLAGS := -m64
 
 include ../Makefile.test.common
+
+TESTARGS += --max-args 0
diff --git a/clang/utils/ABITest/single-args-32/Makefile b/clang/utils/ABITest/single-args-32/Makefile
new file mode 100644
index 000000000000..207a35a73edd
--- /dev/null
+++ b/clang/utils/ABITest/single-args-32/Makefile
@@ -0,0 +1,24 @@
+# Usage: make test.N.report 
+#
+# COUNT can be over-ridden to change the number of tests generated per
+# file, and TESTARGS is used to change the type generation. Make sure
+# to 'make clean' after changing either of these parameters.
+
+COUNT := 1
+TIMEOUT := 5
+
+CFLAGS := -std=gnu99
+
+X_COMPILER := gcc
+X_LL_CFLAGS := -emit-llvm -S
+Y_COMPILER := clang
+Y_LL_CFLAGS := -emit-llvm -S
+CC := gcc
+
+X_CFLAGS := -m32
+Y_CFLAGS := -m32
+CC_CFLAGS := -m32
+
+include ../Makefile.test.common
+
+TESTARGS += --no-function-return --max-args 1
diff --git a/clang/utils/ABITest/single-args-64/Makefile b/clang/utils/ABITest/single-args-64/Makefile
new file mode 100644
index 000000000000..8653cf451459
--- /dev/null
+++ b/clang/utils/ABITest/single-args-64/Makefile
@@ -0,0 +1,24 @@
+# Usage: make test.N.report 
+#
+# COUNT can be over-ridden to change the number of tests generated per
+# file, and TESTARGS is used to change the type generation. Make sure
+# to 'make clean' after changing either of these parameters.
+
+COUNT := 1
+TIMEOUT := 5
+
+CFLAGS := -std=gnu99
+
+X_COMPILER := gcc
+X_LL_CFLAGS := -emit-llvm -S
+Y_COMPILER := clang
+Y_LL_CFLAGS := -emit-llvm -S
+CC := gcc
+
+X_CFLAGS := -m64
+Y_CFLAGS := -m64
+CC_CFLAGS := -m64
+
+include ../Makefile.test.common
+
+TESTARGS += --no-function-return --max-args 1