diff --git a/test/AnnotationTest.thrift b/test/AnnotationTest.thrift
index 06bf571..191995a 100644
--- a/test/AnnotationTest.thrift
+++ b/test/AnnotationTest.thrift
@@ -52,7 +52,7 @@
 /* Note that annotations on senum values are not supported. */
 senum seasons {
   "Spring",
-  "Summer", 
+  "Summer",
   "Fall",
   "Winter"
 } ( foo = "bar" )
diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift
index 3cb3478..fb16982 100644
--- a/test/DebugProtoTest.thrift
+++ b/test/DebugProtoTest.thrift
@@ -110,7 +110,7 @@
   8: bool   true_field;
   9: bool   false_field;
   10: Empty empty_struct_field;
-  
+
   // primitives in lists
   11: list<byte>    byte_list;
   12: list<i16>     i16_list;
@@ -121,7 +121,7 @@
   17: list<binary>  binary_list;
   18: list<bool>    boolean_list;
   19: list<Empty>   struct_list;
-  
+
   // primitives in sets
   20: set<byte>     byte_set;
   21: set<i16>      i16_set;
@@ -132,7 +132,7 @@
   26: set<binary>   binary_set;
   27: set<bool>     boolean_set;
   28: set<Empty>    struct_set;
-  
+
   // maps
   // primitives as keys
   29: map<byte, byte>             byte_byte_map;
diff --git a/test/Makefile.am b/test/Makefile.am
index cc1f43d..7745adc 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,42 +61,42 @@
 # generate html for ThriftTest.thrift
 #
 check-local:
-	$(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
+    $(top_builddir)/compiler/cpp/thrift --gen html -r $(top_srcdir)/test/ThriftTest.thrift
 
 EXTRA_DIST = \
-	keys \
-	test.sh \
-	test.py \
-	tests.json \
-	c_glib \
-	cpp \
-	erl \
-	hs \
-	lua \
-	ocaml \
-	perl \
-	php \
-	py \
-	py.twisted \
-	py.tornado \
-	rb \
-	threads \
-	AnnotationTest.thrift \
-	BrokenConstants.thrift \
-	ConstantsDemo.thrift \
-	DebugProtoTest.thrift \
-	DenseLinkingTest.thrift \
-	DocTest.thrift \
-	Include.thrift \
-	JavaBeansTest.thrift \
-	ManyOptionals.thrift \
-	ManyTypedefs.thrift \
-	NameConflictTest.thrift \
-	OptionalRequiredTest.thrift \
-	Recursive.thrift \
-	ReuseObjects.thrift \
-	SmallTest.thrift \
-	StressTest.thrift \
-	ThriftTest.thrift \
-	FastbinaryTest.py \
-	README.md
+    keys \
+    test.sh \
+    test.py \
+    tests.json \
+    c_glib \
+    cpp \
+    erl \
+    hs \
+    lua \
+    ocaml \
+    perl \
+    php \
+    py \
+    py.twisted \
+    py.tornado \
+    rb \
+    threads \
+    AnnotationTest.thrift \
+    BrokenConstants.thrift \
+    ConstantsDemo.thrift \
+    DebugProtoTest.thrift \
+    DenseLinkingTest.thrift \
+    DocTest.thrift \
+    Include.thrift \
+    JavaBeansTest.thrift \
+    ManyOptionals.thrift \
+    ManyTypedefs.thrift \
+    NameConflictTest.thrift \
+    OptionalRequiredTest.thrift \
+    Recursive.thrift \
+    ReuseObjects.thrift \
+    SmallTest.thrift \
+    StressTest.thrift \
+    ThriftTest.thrift \
+    FastbinaryTest.py \
+    README.md
diff --git a/test/NameConflictTest.thrift b/test/NameConflictTest.thrift
index 24757c0..337be07 100644
--- a/test/NameConflictTest.thrift
+++ b/test/NameConflictTest.thrift
@@ -4,21 +4,21 @@
 
 
 struct using {
-	1: double single
-	2: double integer
+    1: double single
+    2: double integer
 }
 
 struct delegate {
-	1: string partial
-	2: delegate delegate
+    1: string partial
+    2: delegate delegate
 }
 
 struct get {
-	1: bool sbyte
+    1: bool sbyte
 }
 
 struct partial {
-	1: using using
+    1: using using
 }
 
 enum Maybe {
@@ -91,11 +91,11 @@
 }
 
 struct Nested {
-  1: ClassAndProp ClassAndProp 
-  2: second_chance second_chance 
-  3: NOW_EAT_THIS NOW_EAT_THIS 
-  4: TheEdgeCase TheEdgeCase 
-  5: Tricky_ Tricky_ 
+  1: ClassAndProp ClassAndProp
+  2: second_chance second_chance
+  3: NOW_EAT_THIS NOW_EAT_THIS
+  4: TheEdgeCase TheEdgeCase
+  5: Tricky_ Tricky_
   6: Nested Nested
 }
 
@@ -106,12 +106,12 @@
 
 
 service extern {
-	delegate event(1: partial get)
-	void Foo(1: Nested Foo_args) throws (1: Problem_ Foo_result)
+    delegate event(1: partial get)
+    void Foo(1: Nested Foo_args) throws (1: Problem_ Foo_result)
 }
 
 service qualified {
-	Maybe maybe(1: Maybe foldr)
-	Either either(1: foldr of)
+    Maybe maybe(1: Maybe foldr)
+    Either either(1: foldr of)
 }
 // eof
diff --git a/test/Recursive.thrift b/test/Recursive.thrift
index 9c29983..c982582 100644
--- a/test/Recursive.thrift
+++ b/test/Recursive.thrift
@@ -23,12 +23,12 @@
 }
 
 struct RecList {
-  1: RecList & nextitem 
+  1: RecList & nextitem
   3: i16 item
 }
 
 struct CoRec {
-  1:  CoRec2 & other 
+  1:  CoRec2 & other
 }
 
 struct CoRec2 {
diff --git a/test/ThriftTest.thrift b/test/ThriftTest.thrift
index 4a689fe..061a570 100644
--- a/test/ThriftTest.thrift
+++ b/test/ThriftTest.thrift
@@ -135,56 +135,56 @@
    * Prints "testVoid()" and returns nothing.
    */
   void         testVoid(),
-  
+
   /**
    * Prints 'testString("%s")' with thing as '%s'
    * @param string thing - the string to print
    * @return string - returns the string 'thing'
    */
   string       testString(1: string thing),
-  
+
   /**
    * Prints 'testByte("%d")' with thing as '%d'
    * @param byte thing - the byte to print
    * @return byte - returns the byte 'thing'
    */
   byte         testByte(1: byte thing),
-  
+
   /**
    * Prints 'testI32("%d")' with thing as '%d'
    * @param i32 thing - the i32 to print
    * @return i32 - returns the i32 'thing'
    */
   i32          testI32(1: i32 thing),
- 
+
   /**
    * Prints 'testI64("%d")' with thing as '%d'
    * @param i64 thing - the i64 to print
    * @return i64 - returns the i64 'thing'
    */
   i64          testI64(1: i64 thing),
-  
+
   /**
    * Prints 'testDouble("%f")' with thing as '%f'
    * @param double thing - the double to print
    * @return double - returns the double 'thing'
    */
   double       testDouble(1: double thing),
-  
+
   /**
    * Prints 'testStruct("{%s}")' where thing has been formatted into a string of comma seperated values
    * @param Xtruct thing - the Xtruct to print
    * @return Xtruct - returns the Xtruct 'thing'
    */
   Xtruct       testStruct(1: Xtruct thing),
-  
+
   /**
    * Prints 'testNest("{%s}")' where thing has been formatted into a string of the nested struct
    * @param Xtruct2 thing - the Xtruct2 to print
    * @return Xtruct2 - returns the Xtruct2 'thing'
    */
   Xtruct2      testNest(1: Xtruct2 thing),
- 
+
   /**
    * Prints 'testMap("{%s")' where thing has been formatted into a string of  'key => value' pairs
    *  seperated by commas and new lines
@@ -192,7 +192,7 @@
    * @return map<i32,i32> - returns the map<i32,i32> 'thing'
    */
   map<i32,i32> testMap(1: map<i32,i32> thing),
-  
+
   /**
    * Prints 'testStringMap("{%s}")' where thing has been formatted into a string of  'key => value' pairs
    *  seperated by commas and new lines
@@ -200,7 +200,7 @@
    * @return map<string,string> - returns the map<string,string> 'thing'
    */
   map<string,string> testStringMap(1: map<string,string> thing),
-  
+
   /**
    * Prints 'testSet("{%s}")' where thing has been formatted into a string of  values
    *  seperated by commas and new lines
@@ -208,7 +208,7 @@
    * @return set<i32> - returns the set<i32> 'thing'
    */
   set<i32>     testSet(1: set<i32> thing),
-  
+
   /**
    * Prints 'testList("{%s}")' where thing has been formatted into a string of  values
    *  seperated by commas and new lines
@@ -216,7 +216,7 @@
    * @return list<i32> - returns the list<i32> 'thing'
    */
   list<i32>    testList(1: list<i32> thing),
-  
+
   /**
    * Prints 'testEnum("%d")' where thing has been formatted into it's numeric value
    * @param Numberz thing - the Numberz to print
@@ -243,23 +243,23 @@
    * So you think you've got this all worked, out eh?
    *
    * Creates a the returned map with these values and prints it out:
-   *   { 1 => { 2 => argument, 
-   *            3 => argument, 
+   *   { 1 => { 2 => argument,
+   *            3 => argument,
    *          },
    *     2 => { 6 => <empty Insanity struct>, },
    *   }
-   * @return map<UserId, map<Numberz,Insanity>> - a map with the above values 
+   * @return map<UserId, map<Numberz,Insanity>> - a map with the above values
    */
   map<UserId, map<Numberz,Insanity>> testInsanity(1: Insanity argument),
 
   /**
    * Prints 'testMulti()'
-   * @param byte arg0 - 
-   * @param i32 arg1 - 
-   * @param i64 arg2 - 
-   * @param map<i16, string> arg3 - 
-   * @param Numberz arg4 - 
-   * @param UserId arg5 - 
+   * @param byte arg0 -
+   * @param i32 arg1 -
+   * @param i64 arg2 -
+   * @param map<i16, string> arg3 -
+   * @param Numberz arg4 -
+   * @param UserId arg5 -
    * @return Xtruct - returns an Xtruct with string_thing = "Hello2, byte_thing = arg0, i32_thing = arg1
    *    and i64_thing = arg2
    */
diff --git a/test/c_glib/Makefile.am b/test/c_glib/Makefile.am
index de23cb9..7de3998 100755
--- a/test/c_glib/Makefile.am
+++ b/test/c_glib/Makefile.am
@@ -19,34 +19,34 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtestcglib.la
 nodist_libtestcglib_la_SOURCES = \
-	gen-c_glib/t_test_second_service.c \
-	gen-c_glib/t_test_second_service.h \
-	gen-c_glib/t_test_thrift_test.c \
-	gen-c_glib/t_test_thrift_test.h \
-	gen-c_glib/t_test_thrift_test_types.c \
-	gen-c_glib/t_test_thrift_test_types.h
+    gen-c_glib/t_test_second_service.c \
+    gen-c_glib/t_test_second_service.h \
+    gen-c_glib/t_test_thrift_test.c \
+    gen-c_glib/t_test_thrift_test.h \
+    gen-c_glib/t_test_thrift_test_types.c \
+    gen-c_glib/t_test_thrift_test_types.h
 
 libtestcglib_la_LIBADD = $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 check_PROGRAMS = \
-	test_client \
-	test_server
+    test_client \
+    test_server
 
 test_client_SOURCES = \
-	src/test_client.c
+    src/test_client.c
 
 test_client_LDADD = \
-	libtestcglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+    libtestcglib.la \
+    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 test_server_SOURCES = \
-	src/thrift_test_handler.c \
-	src/thrift_test_handler.h \
-	src/test_server.c
+    src/thrift_test_handler.c \
+    src/thrift_test_handler.h \
+    src/test_server.c
 
 test_server_LDADD = \
-	libtestcglib.la \
-	$(top_builddir)/lib/c_glib/libthrift_c_glib.la
+    libtestcglib.la \
+    $(top_builddir)/lib/c_glib/libthrift_c_glib.la
 
 #
 # Common thrift code generation rules
@@ -54,7 +54,7 @@
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-c_glib/t_test_second_service.c  gen-c_glib/t_test_second_service.h  gen-c_glib/t_test_thrift_test.c  gen-c_glib/t_test_thrift_test.h  gen-c_glib/t_test_thrift_test_types.c  gen-c_glib/t_test_thrift_test_types.h: $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen c_glib -r $<
+    $(THRIFT) --gen c_glib -r $<
 
 AM_CFLAGS = -g -Wall -Wextra $(GLIB_CFLAGS) $(GOBJECT_CFLAGS)
 AM_CXXFLAGS = $(AM_CFLAGS)
@@ -62,10 +62,10 @@
 AM_LDFLAGS = $(GLIB_LIBS) $(GOBJECT_LIBS) @GCOV_LDFLAGS@
 
 clean-local:
-	$(RM) -r gen-c_glib
+    $(RM) -r gen-c_glib
 
 EXTRA_DIST = \
-	src/test_client.c \
-	src/thrift_test_handler.c \
-	src/thrift_test_handler.h \
-	src/test_server.c
+    src/test_client.c \
+    src/thrift_test_handler.c \
+    src/thrift_test_handler.h \
+    src/test_server.c
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am
index 3dbcaaa..d1086c0 100755
--- a/test/cpp/Makefile.am
+++ b/test/cpp/Makefile.am
@@ -19,94 +19,94 @@
 .NOTPARALLEL:
 noinst_LTLIBRARIES = libtestgencpp.la libstresstestgencpp.la
 nodist_libtestgencpp_la_SOURCES = \
-	gen-cpp/ThriftTest_constants.cpp \
-	gen-cpp/ThriftTest_constants.h \
-	gen-cpp/ThriftTest_types.cpp \
-	gen-cpp/ThriftTest_types.h \
-	gen-cpp/ThriftTest_types.tcc \
-	gen-cpp/ThriftTest.cpp \
-	gen-cpp/ThriftTest.h \
-	gen-cpp/ThriftTest.tcc \
-	src/ThriftTest_extras.cpp
+    gen-cpp/ThriftTest_constants.cpp \
+    gen-cpp/ThriftTest_constants.h \
+    gen-cpp/ThriftTest_types.cpp \
+    gen-cpp/ThriftTest_types.h \
+    gen-cpp/ThriftTest_types.tcc \
+    gen-cpp/ThriftTest.cpp \
+    gen-cpp/ThriftTest.h \
+    gen-cpp/ThriftTest.tcc \
+    src/ThriftTest_extras.cpp
 
 libtestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 nodist_libstresstestgencpp_la_SOURCES = \
-	gen-cpp/StressTest_constants.cpp \
-	gen-cpp/StressTest_types.cpp \
-	gen-cpp/StressTest_constants.h \
-	gen-cpp/StressTest_types.h \
-	gen-cpp/Service.cpp \
-	gen-cpp/Service.h
+    gen-cpp/StressTest_constants.cpp \
+    gen-cpp/StressTest_types.cpp \
+    gen-cpp/StressTest_constants.h \
+    gen-cpp/StressTest_types.h \
+    gen-cpp/Service.cpp \
+    gen-cpp/Service.h
 
 libstresstestgencpp_la_LIBADD = $(top_builddir)/lib/cpp/libthrift.la
 
 check_PROGRAMS = \
-	TestServer \
-	TestClient \
-	StressTest \
-	StressTestNonBlocking
+    TestServer \
+    TestClient \
+    StressTest \
+    StressTestNonBlocking
 
 # we currently do not run the testsuite, stop c++ server issue
 # TESTS = \
-#	$(check_PROGRAMS)
+#    $(check_PROGRAMS)
 
 TestServer_SOURCES = \
-	src/TestServer.cpp
+    src/TestServer.cpp
 
 TestServer_LDADD = \
-	libtestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(top_builddir)/lib/cpp/libthriftz.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent -lboost_program_options -lboost_system -lboost_filesystem
+    libtestgencpp.la \
+    $(top_builddir)/lib/cpp/libthrift.la \
+    $(top_builddir)/lib/cpp/libthriftz.la \
+    $(top_builddir)/lib/cpp/libthriftnb.la \
+    -levent -lboost_program_options -lboost_system -lboost_filesystem
 
 TestClient_SOURCES = \
-	src/TestClient.cpp
+    src/TestClient.cpp
 
 TestClient_LDADD = \
-	libtestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la \
-	$(top_builddir)/lib/cpp/libthriftz.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent -lboost_program_options -lboost_system -lboost_filesystem
+    libtestgencpp.la \
+    $(top_builddir)/lib/cpp/libthrift.la \
+    $(top_builddir)/lib/cpp/libthriftz.la \
+    $(top_builddir)/lib/cpp/libthriftnb.la \
+    -levent -lboost_program_options -lboost_system -lboost_filesystem
 
 StressTest_SOURCES = \
-	src/StressTest.cpp
+    src/StressTest.cpp
 
 StressTest_LDADD = \
-	libstresstestgencpp.la \
-	$(top_builddir)/lib/cpp/libthrift.la
+    libstresstestgencpp.la \
+    $(top_builddir)/lib/cpp/libthrift.la
 
 StressTestNonBlocking_SOURCES = \
-	src/StressTestNonBlocking.cpp
+    src/StressTestNonBlocking.cpp
 
 StressTestNonBlocking_LDADD = \
-	libstresstestgencpp.la \
-	$(top_builddir)/lib/cpp/libthriftnb.la \
-	-levent
+    libstresstestgencpp.la \
+    $(top_builddir)/lib/cpp/libthriftnb.la \
+    -levent
 #
 # Common thrift code generation rules
 #
 THRIFT = $(top_builddir)/compiler/cpp/thrift
 
 gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants.cpp: $(top_srcdir)/test/ThriftTest.thrift
-	$(THRIFT) --gen cpp:templates,cob_style -r $<
+    $(THRIFT) --gen cpp:templates,cob_style -r $<
 
 gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp: $(top_srcdir)/test/StressTest.thrift
-	$(THRIFT) --gen cpp $<
+    $(THRIFT) --gen cpp $<
 
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp
 AM_CXXFLAGS = -Wall
 AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS)
 
 clean-local:
-	$(RM) -r gen-cpp
+    $(RM) -r gen-cpp
 
 EXTRA_DIST = \
-	src/TestClient.cpp \
-	src/TestServer.cpp \
-	src/StressTest.cpp \
-	src/StressTestNonBlocking.cpp \
-	realloc/realloc_test.c \
-	realloc/Makefile
+    src/TestClient.cpp \
+    src/TestServer.cpp \
+    src/StressTest.cpp \
+    src/StressTestNonBlocking.cpp \
+    realloc/realloc_test.c \
+    realloc/Makefile
diff --git a/test/erl/Makefile.am b/test/erl/Makefile.am
index 309d07e..030c6fb 100644
--- a/test/erl/Makefile.am
+++ b/test/erl/Makefile.am
@@ -23,16 +23,16 @@
 THRIFT_FILES = $(wildcard ../*.thrift)
 
 .generated: $(THRIFT_FILES)
-	for f in $(THRIFT_FILES) ; do \
-	  $(THRIFT) --gen erl $$f ; \
-	done ; \
-	$(THRIFT) --gen erl:legacynames LegacyNames.thrift
-	touch .generated
+    for f in $(THRIFT_FILES) ; do \
+      $(THRIFT) --gen erl $$f ; \
+    done ; \
+    $(THRIFT) --gen erl:legacynames LegacyNames.thrift
+    touch .generated
 
 check: .generated
-	$(REBAR) eunit
+    $(REBAR) eunit
 
 clean:
-	rm -f .generated
-	rm -rf gen-erl
-	$(REBAR) clean
+    rm -f .generated
+    rm -rf gen-erl
+    $(REBAR) clean
diff --git a/test/go/Makefile.am b/test/go/Makefile.am
index 66f81ad..afea106 100644
--- a/test/go/Makefile.am
+++ b/test/go/Makefile.am
@@ -24,36 +24,36 @@
 all: bin/testclient bin/testserver bin/stress
 
 ThriftTest.thrift: $(THRIFTTEST)
-	grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
+    grep -v list.*map.*list.*map $(THRIFTTEST) > ThriftTest.thrift
 
 # Thrift for GO has problems with complex map keys: THRIFT-2063
 gopath: $(THRIFT) ThriftTest.thrift
-	mkdir -p src/gen
-	$(THRIFTCMD) ThriftTest.thrift
-	$(THRIFTCMD) ../StressTest.thrift
-	ln -nfs ../../../lib/go/thrift src/thrift
-	GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock
-	touch gopath
+    mkdir -p src/gen
+    $(THRIFTCMD) ThriftTest.thrift
+    $(THRIFTCMD) ../StressTest.thrift
+    ln -nfs ../../../lib/go/thrift src/thrift
+    GOPATH=`pwd` $(GO) get code.google.com/p/gomock/gomock
+    touch gopath
 
 bin/testclient: gopath
-	GOPATH=`pwd` $(GO) install bin/testclient
+    GOPATH=`pwd` $(GO) install bin/testclient
 
 bin/testserver: gopath
-	GOPATH=`pwd` $(GO) install bin/testserver
+    GOPATH=`pwd` $(GO) install bin/testserver
 
 bin/stress: gopath
-	GOPATH=`pwd` $(GO) install bin/stress
+    GOPATH=`pwd` $(GO) install bin/stress
 
 clean-local:
-	$(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift
+    $(RM) -r src/gen src/code.google.com src/thrift bin pkg gopath ThriftTest.thrift
 
 check: gopath
-	GOPATH=`pwd` $(GO) test -v common/...
+    GOPATH=`pwd` $(GO) test -v common/...
 
 genmock: gopath
-	GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
-	GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
+    GOPATH=`pwd` $(GO) install code.google.com/p/gomock/mockgen
+    GOPATH=`pwd` bin/mockgen -destination=src/common/mock_handler.go -package=common gen/thrifttest ThriftTest
 
 EXTRA_DIST = \
-	src/bin \
-	src/common
+    src/bin \
+    src/common
diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am
index 2629ca1..a39d025 100644
--- a/test/hs/Makefile.am
+++ b/test/hs/Makefile.am
@@ -20,24 +20,24 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift ../NameConflictTest.thrift
-	$(THRIFT) --gen hs ../ConstantsDemo.thrift
-	$(THRIFT) --gen hs ../DebugProtoTest.thrift
-	$(THRIFT) --gen hs ../ThriftTest.thrift
-	$(THRIFT) --gen hs ../Include.thrift
-	$(THRIFT) --gen hs ../NameConflictTest.thrift
+    $(THRIFT) --gen hs ../ConstantsDemo.thrift
+    $(THRIFT) --gen hs ../DebugProtoTest.thrift
+    $(THRIFT) --gen hs ../ThriftTest.thrift
+    $(THRIFT) --gen hs ../Include.thrift
+    $(THRIFT) --gen hs ../NameConflictTest.thrift
 
 check: stubs
-	sh run-test.sh ConstantsDemo
-	sh run-test.sh DebugProtoTest
-	sh run-test.sh ThriftTest
-	sh run-test.sh Include
-	sh run-test.sh NameConflictTest
+    sh run-test.sh ConstantsDemo
+    sh run-test.sh DebugProtoTest
+    sh run-test.sh ThriftTest
+    sh run-test.sh Include
+    sh run-test.sh NameConflictTest
 
 clean-local:
-	$(RM) -r gen-hs
-	$(RM) *.hi
-	$(RM) *.o
+    $(RM) -r gen-hs
+    $(RM) *.hi
+    $(RM) *.o
 
 all: check
-	ghc -igen-hs TestServer.hs
-	ghc -igen-hs TestClient.hs
\ No newline at end of file
+    ghc -igen-hs TestServer.hs
+    ghc -igen-hs TestClient.hs
\ No newline at end of file
diff --git a/test/perl/Makefile.am b/test/perl/Makefile.am
index 291106b..7fd151a 100644
--- a/test/perl/Makefile.am
+++ b/test/perl/Makefile.am
@@ -20,10 +20,10 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
-	$(THRIFT) --gen perl ../ThriftTest.thrift
+    $(THRIFT) --gen perl ../ThriftTest.thrift
 
 check: stubs
 
 clean-local:
-	$(RM) -r gen-perl
+    $(RM) -r gen-perl
 
diff --git a/test/php/Makefile.am b/test/php/Makefile.am
index 1625903..d3f38f8 100755
--- a/test/php/Makefile.am
+++ b/test/php/Makefile.am
@@ -20,13 +20,13 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift
-	$(THRIFT) --gen php ../ThriftTest.thrift
-	$(THRIFT) --gen php:inlined ../ThriftTest.thrift
+    $(THRIFT) --gen php ../ThriftTest.thrift
+    $(THRIFT) --gen php:inlined ../ThriftTest.thrift
 
 check: stubs
 
 clean-local:
-	$(RM) -r gen-php gen-phpi
+    $(RM) -r gen-php gen-phpi
 
 client: stubs
-	php TestClient.php
+    php TestClient.php
diff --git a/test/py.tornado/Makefile.am b/test/py.tornado/Makefile.am
index a8e680a..a33b725 100644
--- a/test/py.tornado/Makefile.am
+++ b/test/py.tornado/Makefile.am
@@ -20,11 +20,11 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 thrift_gen: ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen py:tornado ../ThriftTest.thrift
-	$(THRIFT) --gen py:tornado ../SmallTest.thrift
+    $(THRIFT) --gen py:tornado ../ThriftTest.thrift
+    $(THRIFT) --gen py:tornado ../SmallTest.thrift
 
 check: thrift_gen
-	./test_suite.py
+    ./test_suite.py
 
 clean-local:
-	$(RM) -r gen-py.tornado
+    $(RM) -r gen-py.tornado
diff --git a/test/py.twisted/Makefile.am b/test/py.twisted/Makefile.am
index 4723b7d..414c5c4 100644
--- a/test/py.twisted/Makefile.am
+++ b/test/py.twisted/Makefile.am
@@ -20,11 +20,11 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen py:twisted ../ThriftTest.thrift
-	$(THRIFT) --gen py:twisted ../SmallTest.thrift
+    $(THRIFT) --gen py:twisted ../ThriftTest.thrift
+    $(THRIFT) --gen py:twisted ../SmallTest.thrift
 
 check: stubs
-	$(TRIAL) test_suite.py
+    $(TRIAL) test_suite.py
 
 clean-local:
-	$(RM) -r gen-py.twisted
+    $(RM) -r gen-py.twisted
diff --git a/test/py/Makefile.am b/test/py/Makefile.am
index 6b31769..318196a 100755
--- a/test/py/Makefile.am
+++ b/test/py/Makefile.am
@@ -50,29 +50,29 @@
 
 
 gen-py/%/__init__.py: ../%.thrift
-	$(THRIFT) --gen py  $<
-	test -d gen-py-default || mkdir gen-py-default
-	$(THRIFT) --gen py -out gen-py-default $<
+    $(THRIFT) --gen py  $<
+    test -d gen-py-default || mkdir gen-py-default
+    $(THRIFT) --gen py -out gen-py-default $<
 
 gen-py-slots/%/__init__.py: ../%.thrift
-	test -d gen-py-slots || mkdir gen-py-slots
-	$(THRIFT) --gen py:slots -out gen-py-slots $<
+    test -d gen-py-slots || mkdir gen-py-slots
+    $(THRIFT) --gen py:slots -out gen-py-slots $<
 
 gen-py-newstyle/%/__init__.py: ../%.thrift
-	test -d gen-py-newstyle || mkdir gen-py-newstyle
-	$(THRIFT) --gen py:new_style -out gen-py-newstyle $<
+    test -d gen-py-newstyle || mkdir gen-py-newstyle
+    $(THRIFT) --gen py:new_style -out gen-py-newstyle $<
 
 gen-py-newstyleslots/%/__init__.py: ../%.thrift
-	test -d gen-py-newstyleslots || mkdir gen-py-newstyleslots
-	$(THRIFT) --gen py:new_style,slots -out gen-py-newstyleslots $<
+    test -d gen-py-newstyleslots || mkdir gen-py-newstyleslots
+    $(THRIFT) --gen py:new_style,slots -out gen-py-newstyleslots $<
 
 gen-py-dynamic/%/__init__.py: ../%.thrift
-	test -d gen-py-dynamic || mkdir gen-py-dynamic
-	$(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
+    test -d gen-py-dynamic || mkdir gen-py-dynamic
+    $(THRIFT) --gen py:dynamic -out gen-py-dynamic $<
 
 gen-py-dynamicslots/%/__init__.py: ../%.thrift
-	test -d gen-py-dynamicslots || mkdir gen-py-dynamicslots
-	$(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
+    test -d gen-py-dynamicslots || mkdir gen-py-dynamicslots
+    $(THRIFT) --gen py:dynamic,slots -out gen-py-dynamicslots $<
 
 clean-local:
-	$(RM) -r gen-py gen-py-slots gen-py-default gen-py-newstyle gen-py-newstyleslots gen-py-dynamic gen-py-dynamicslots
+    $(RM) -r gen-py gen-py-slots gen-py-default gen-py-newstyle gen-py-newstyleslots gen-py-dynamic gen-py-dynamicslots
diff --git a/test/rb/Makefile.am b/test/rb/Makefile.am
index 9cdd99b..eb91293 100644
--- a/test/rb/Makefile.am
+++ b/test/rb/Makefile.am
@@ -20,12 +20,12 @@
 THRIFT = $(top_srcdir)/compiler/cpp/thrift
 
 stubs: ../ThriftTest.thrift ../SmallTest.thrift
-	$(THRIFT) --gen rb ../ThriftTest.thrift
-	$(THRIFT) --gen rb ../SmallTest.thrift
+    $(THRIFT) --gen rb ../ThriftTest.thrift
+    $(THRIFT) --gen rb ../SmallTest.thrift
 
 check: stubs
 if HAVE_BUNDLER
-	$(BUNDLER) install
-	$(BUNDLER) exec $(RUBY) -I. test_suite.rb
+    $(BUNDLER) install
+    $(BUNDLER) exec $(RUBY) -I. test_suite.rb
 endif