diff --git a/llvm/tools/llvmc2/Tools.td b/llvm/tools/llvmc2/Tools.td
index ae60874ea8f5..0e3faa3990a6 100644
--- a/llvm/tools/llvmc2/Tools.td
+++ b/llvm/tools/llvmc2/Tools.td
@@ -27,10 +27,10 @@ def llvm_gcc_c : Tool<
  (output_suffix "bc"),
  (cmd_line (case
             (switch_on "E"),
-              "llvm-g++ -E -x c $INFILE -o $OUTFILE",
+              "llvm-g++ -E -x c $INFILE",
             (default),
               "llvm-g++ -c -x c $INFILE -o $OUTFILE -emit-llvm")),
- (switch_option "E", (stop_compilation),(output_suffix "i"),
+ (switch_option "E", (stop_compilation),
    (help "Stop after the preprocessing stage, do not run the compiler")),
  (sink)
 ]>;
@@ -41,10 +41,10 @@ def llvm_gcc_cpp : Tool<
  (output_suffix "bc"),
  (cmd_line (case
             (switch_on "E"),
-              "llvm-g++ -E -x c++ $INFILE -o $OUTFILE",
+              "llvm-g++ -E -x c++ $INFILE",
             (default),
               "llvm-g++ -c -x c++ $INFILE -o $OUTFILE -emit-llvm")),
- (switch_option "E", (stop_compilation), (output_suffix "i")),
+ (switch_option "E", (stop_compilation)),
  (sink)
 ]>;
 
diff --git a/llvm/tools/llvmc2/examples/Clang.td b/llvm/tools/llvmc2/examples/Clang.td
index c06737238b3b..bc9342d9797a 100644
--- a/llvm/tools/llvmc2/examples/Clang.td
+++ b/llvm/tools/llvmc2/examples/Clang.td
@@ -8,7 +8,8 @@ def clang : Tool<
 [(in_language ["c", "c++", "objective-c"]),
  (out_language "llvm-bitcode"),
  (output_suffix "bc"),
- (cmd_line (case (switch_on "E"), "clang -E $INFILE -o $OUTFILE",
+ // TOFIX: We should be able to test the language of the input file
+ (cmd_line (case (switch_on "E"), "clang -E $INFILE",
                  (default), "clang -emit-llvm-bc $INFILE -o $OUTFILE")),
  (switch_option "E", (stop_compilation), (output_suffix "i"),
    (help "Stop after the preprocessing stage, do not run the compiler")),