diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index ec18d344c..a55d31f82 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -92,15 +92,10 @@ CPP_TEST_BROKEN += \
 	template_expr \
 	$(CPP11_TEST_BROKEN)
 
-
 # Broken C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_BROKEN += \
 	tag_no_clash_with_variable
 
-# Note: this allows to override the global list of tests for the purpose of
-# smoke testing to foster shorter test-driven development cycles
-ifndef SMOKE_TESTS_ONLY
-
 # C++ test cases. (Can be run individually using: make testcase.cpptest)
 CPP_TEST_CASES += \
 	abstract_access \
@@ -497,11 +492,6 @@ CPP_TEST_CASES += \
 	wallkw \
 	wrapmacro
 
-endif #SMOKE_TESTS_ONLY
-
-
-ifndef SMOKE_TESTS_ONLY
-
 # C++11 test cases.
 CPP11_TEST_CASES = \
 	cpp11_alignment \
@@ -535,8 +525,6 @@ CPP11_TEST_CASES = \
 	cpp11_unrestricted_unions \
 	cpp11_userdefined_literals \
 
-endif # SMOKE_TESTS_ONLY
-
 # Broken C++11 test cases.
 CPP11_TEST_BROKEN = \
 #	cpp11_hash_tables \           # not fully implemented yet
@@ -544,8 +532,6 @@ CPP11_TEST_BROKEN = \
 #	cpp11_variadic_templates \    # Broken for some languages (such as Java)
 #	cpp11_reference_wrapper \     # No typemaps
 
-ifndef SMOKE_TESTS_ONLY
-
 #
 # Put all the heavy STD/STL cases here, where they can be skipped if needed
 #
@@ -570,17 +556,12 @@ CPP_STD_TEST_CASES += \
 	template_opaque
 #        li_std_list
 
-endif # SMOKE_TESTS_ONLY
-
 CPP_TEST_CASES += ${CPP_STD_TEST_CASES}
 
 ifneq (,$(HAVE_CXX11_COMPILER))
 CPP_TEST_CASES += $(CPP11_TEST_CASES)
 endif
 
-
-ifndef SMOKE_TESTS_ONLY
-
 # C test cases. (Can be run individually using: make testcase.ctest)
 C_TEST_CASES += \
 	arrays \
@@ -634,10 +615,6 @@ C_TEST_CASES += \
 	union_parameter \
 	unions
 
-endif # SMOKE_TESTS_ONLY
-
-ifndef SMOKE_TESTS_ONLY
-
 # Multi-module C++ test cases . (Can be run individually using make testcase.multicpptest)
 MULTI_CPP_TEST_CASES += \
 	clientdata_prop \
@@ -648,8 +625,6 @@ MULTI_CPP_TEST_CASES += \
 	template_typedef_import \
 	multi_import
 
-endif # SMOKE_TESTS_ONLY
-
 # Custom tests - tests with additional commandline options
 wallkw.cpptest: SWIGOPT += -Wallkw
 preproc_include.ctest: SWIGOPT += -includeall
diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in
index 0d861173e..2074f89af 100755
--- a/Examples/test-suite/javascript/Makefile.in
+++ b/Examples/test-suite/javascript/Makefile.in
@@ -16,67 +16,20 @@ else
 	JSENGINE=node
 endif
 
-ifeq (1,$(SMOKE))
-
-C_TEST_CASES = \
-  preproc \
-  preproc_include
-
-CPP_TEST_CASES = \
-  abstract_access \
-  abstract_typedef \
-  abstract_typedef2 \
-  abstract_virtual \
-  arrays_global \
-  array_member \
-  char_binary \
-  class_ignore \
-  class_scope_weird \
-  complextest \
-  constover \
-  constructor_copy \
-  cpp_enum \
-  cpp_namespace \
-  cpp_static \
-  enum_template \
-  namespace_virtual_method \
-  nspace \
-  nspace_extend \
-  overload_copy \
-  rename_simple \
-  rename_scope \
-  ret_by_value \
-  struct_value \
-  template_static \
-  typedef_class \
-  typedef_inherit \
-  typedef_scope \
-  typemap_arrays \
-  typemap_delete \
-  typemap_namespace \
-  typemap_ns_using \
-  using1 \
-  using2 \
-  javascript_unicode
-
-SMOKE_TESTS_ONLY=1
-
-endif
-
 include $(srcdir)/../common.mk
 
 _setup = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then	  \
-	  echo "$(ACTION)ing testcase $* (with run test) under javascript ($(JSENGINE))" ; \
+	  echo "$(ACTION)ing $(LANGUAGE) ($(JSENGINE)) testcase $* (with run test)" ; \
 	else								  \
-	  echo "$(ACTION)ing testcase $* under javascript ($(JSENGINE))" ;		  \
+	  echo "$(ACTION)ing $(LANGUAGE) ($(JSENGINE)) testcase $*" ;     \
 	fi;
 
 ifneq (jsc,$(ENGINE))
 
   # This test can not be run with v8 as it uses v8 API incompatible output typemaps
   typemap_variables.cpptest:
-		echo "skipping testcase typemap_variables under javascript ($(JSENGINE))."
+	  echo "skipping $(LANGUAGE) ($(JSENGINE)) testcase $*" ;
 
   # with v8 we have to generate C++ wrappers only
   # these tests did raise warnings which are ignored