diff --git a/test/LLVMC/AppendCmdHook.td b/test/LLVMC/AppendCmdHook.td
index 4a9d39121a4..539a93f8349 100644
--- a/test/LLVMC/AppendCmdHook.td
+++ b/test/LLVMC/AppendCmdHook.td
@@ -13,14 +13,14 @@ def OptList : OptionList<[
 ]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy_lang"),
 (out_language "dummy_lang"),
 (actions (case
-         // CHECK: push_back("-arg1")
-         // CHECK: push_back("-arg2")
+         // CHECK: , "-arg1"));
+         // CHECK: , "-arg2"));
          (switch_on "dummy1"), (append_cmd "-arg1 -arg2"),
-         // CHECK: push_back("-arg3")
+         // CHECK: , "-arg3"));
          // CHECK: hooks::MyHook()
          (switch_on "dummy2"), (append_cmd "-arg3 $CALL(MyHook)")))
 ]>;
diff --git a/test/LLVMC/EnvParentheses.td b/test/LLVMC/EnvParentheses.td
index 77aab95c5f0..c563171335d 100644
--- a/test/LLVMC/EnvParentheses.td
+++ b/test/LLVMC/EnvParentheses.td
@@ -1,13 +1,13 @@
 // Check the fix for PR4157.
 // http://llvm.org/bugs/show_bug.cgi?id=4157
 // RUN: tblgen -I %p/../../include --gen-llvmc %s -o %t
-// RUN: not grep {)));} %t
+// RUN: not grep {FOO")));} %t
 // RUN: %compile_cxx -fexceptions -x c++ %t
 
 include "llvm/CompilerDriver/Common.td"
 
 def dummy_tool : Tool<[
-(cmd_line "gcc -o $OUTFILE $INFILE $ENV(FOO)/bar"),
+(command "gcc $ENV(FOO)/bar"),
 (in_language "dummy"),
 (out_language "dummy")
 ]>;
diff --git a/test/LLVMC/ExternOptions.td b/test/LLVMC/ExternOptions.td
index a05f2ca15b6..77cb4bf6526 100644
--- a/test/LLVMC/ExternOptions.td
+++ b/test/LLVMC/ExternOptions.td
@@ -13,7 +13,7 @@ def OptList : OptionList<[(switch_option "Wall", (extern)),
                           (prefix_list_option "L", (extern))]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
diff --git a/test/LLVMC/ForwardAs.td b/test/LLVMC/ForwardAs.td
index ce6fbb06ef5..7c3bd1798a2 100644
--- a/test/LLVMC/ForwardAs.td
+++ b/test/LLVMC/ForwardAs.td
@@ -9,11 +9,11 @@ include "llvm/CompilerDriver/Common.td"
 def OptList : OptionList<[(parameter_option "dummy", (extern))]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
-         // CHECK: vec.push_back("unique_name")
+         // CHECK: "unique_name"));
          (not_empty "dummy"), (forward_as "dummy", "unique_name")))
 ]>;
 
diff --git a/test/LLVMC/ForwardTransformedValue.td b/test/LLVMC/ForwardTransformedValue.td
index e26345362c0..2caef6cd539 100644
--- a/test/LLVMC/ForwardTransformedValue.td
+++ b/test/LLVMC/ForwardTransformedValue.td
@@ -13,7 +13,7 @@ def OptList : OptionList<[(parameter_option "a", (extern)),
 // CHECK: std::string HookB
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
diff --git a/test/LLVMC/ForwardValue.td b/test/LLVMC/ForwardValue.td
index 31e395e6d0b..463235c6111 100644
--- a/test/LLVMC/ForwardValue.td
+++ b/test/LLVMC/ForwardValue.td
@@ -10,13 +10,13 @@ def OptList : OptionList<[(parameter_option "a", (extern)),
                           (prefix_list_option "b", (extern))]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
-         // CHECK: vec.push_back(AutoGeneratedParameter_a)
+         // CHECK: , AutoGeneratedParameter_a));
          (not_empty "a"), (forward_value "a"),
-         // CHECK: std::copy(AutoGeneratedList_b.begin()
+         // CHECK: B = AutoGeneratedList_b.begin()
          (not_empty "b"), (forward_value "b")))
 ]>;
 
diff --git a/test/LLVMC/HookWithArguments.td b/test/LLVMC/HookWithArguments.td
index ba0bbe10d37..312fa9ccebb 100644
--- a/test/LLVMC/HookWithArguments.td
+++ b/test/LLVMC/HookWithArguments.td
@@ -6,12 +6,12 @@
 include "llvm/CompilerDriver/Common.td"
 
 // CHECK: Hook(const char* Arg0, const char* Arg1, const char* Arg2);
+// CHECK: "/path"
 // CHECK: std::getenv("VARIABLE")
 // CHECK: "/2path"
-// CHECK: "/path"
 
 def dummy_tool : Tool<[
-(cmd_line "$CALL(Hook, 'Arg1',   'Arg2', 'Arg3 Arg3Cont')/path arg1 $ENV(VARIABLE)/2path arg2 $INFILE"),
+(command "$CALL(Hook, 'Arg1',   'Arg2', 'Arg3 Arg3Cont')/path arg1 $ENV(VARIABLE)/2path arg2"),
 (in_language "dummy"),
 (out_language "dummy")
 ]>;
diff --git a/test/LLVMC/HookWithInFile.td b/test/LLVMC/HookWithInFile.td
index e15e43cdf04..f58e3f4288f 100644
--- a/test/LLVMC/HookWithInFile.td
+++ b/test/LLVMC/HookWithInFile.td
@@ -7,7 +7,7 @@ include "llvm/CompilerDriver/Common.td"
 
 def dummy_tool : Tool<[
 // CHECK: Hook(inFile.c_str())
-(cmd_line "$CALL(Hook, '$INFILE')/path $INFILE"),
+(command "$CALL(Hook, '$INFILE')/path"),
 (in_language "dummy"),
 (out_language "dummy")
 ]>;
diff --git a/test/LLVMC/Init.td b/test/LLVMC/Init.td
index 355d83ff95a..ff9a0d8d90f 100644
--- a/test/LLVMC/Init.td
+++ b/test/LLVMC/Init.td
@@ -13,7 +13,7 @@ def OptList : OptionList<[
 ]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy_lang"),
 (out_language "dummy_lang"),
 (actions (case
diff --git a/test/LLVMC/MultiValuedOption.td b/test/LLVMC/MultiValuedOption.td
index 8cb18782700..b52af57ade6 100644
--- a/test/LLVMC/MultiValuedOption.td
+++ b/test/LLVMC/MultiValuedOption.td
@@ -12,7 +12,7 @@ def OptList : OptionList<[
     (parameter_list_option "baz", (multi_val 2), (extern))]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
diff --git a/test/LLVMC/NoActions.td b/test/LLVMC/NoActions.td
index 9c2d45a810f..015bfdd0973 100644
--- a/test/LLVMC/NoActions.td
+++ b/test/LLVMC/NoActions.td
@@ -7,7 +7,7 @@ include "llvm/CompilerDriver/Common.td"
 
 // CHECK: class dummy_tool : public Tool {
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy")
 ]>;
diff --git a/test/LLVMC/OneOrMore.td b/test/LLVMC/OneOrMore.td
index ddf7cd1143a..42ec693fbb7 100644
--- a/test/LLVMC/OneOrMore.td
+++ b/test/LLVMC/OneOrMore.td
@@ -13,7 +13,7 @@ def OptList : OptionList<[
     (parameter_list_option "baz", (optional))]>;
 
 def dummy_tool : Tool<[
-(cmd_line "dummy_cmd $INFILE"),
+(command "dummy_cmd"),
 (in_language "dummy"),
 (out_language "dummy"),
 (actions (case
diff --git a/test/LLVMC/OptionPreprocessor.td b/test/LLVMC/OptionPreprocessor.td
index 8d748eee532..8a314818a0a 100644
--- a/test/LLVMC/OptionPreprocessor.td
+++ b/test/LLVMC/OptionPreprocessor.td
@@ -52,7 +52,7 @@ def dummy : Tool<
 [(in_language "dummy"),
  (out_language "dummy"),
  (output_suffix "d"),
- (cmd_line "dummy $INFILE -o $OUTFILE"),
+ (command "dummy"),
  (actions (case (switch_on "foo"), (error),
                 (switch_on "bar"), (error),
                 (switch_on "baz"), (error),