diff --git a/SPECS/nodejs-cmd-shim.spec b/SPECS/nodejs-cmd-shim.spec
index 4ebe1cb..e8a45a9 100644
--- a/SPECS/nodejs-cmd-shim.spec
+++ b/SPECS/nodejs-cmd-shim.spec
@@ -1,27 +1,26 @@
 %{?scl:%scl_package nodejs-cmd-shim}
 %{!?scl:%global pkg_name %{name}}
 
+%{!?scl:%global enable_tests 1}
+
 %{?nodejs_find_provides_and_requires}
 
 Name:           %{?scl_prefix}nodejs-cmd-shim
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Used to create executable scripts on Windows and Unix
 BuildArch:      noarch
 ExclusiveArch: %{nodejs_arches} noarch
-
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/ForbesLindesay/cmd-shim
 Source0:        http://registry.npmjs.org/cmd-shim/-/cmd-shim-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  %{?scl_prefix}nodejs-devel
 
-#for tests
-#BuildRequires:  npm(tap)
-#BuildRequires:  npm(mkdirp)
-#BuildRequires:  npm(rimraf)
+%if 0%{?enable_tests}
+BuildRequires:  npm(tap)
+BuildRequires:  npm(mkdirp)
+BuildRequires:  npm(rimraf)
+%endif
 
 %description
 The cmd-shim used in npm to create executable scripts on Windows, since symlinks
@@ -40,26 +39,27 @@ sed -i 's/\r//g' README.md LICENSE
 #nothing to do
 
 %install
-rm -rf %buildroot
-
 mkdir -p %{buildroot}%{nodejs_sitelib}/cmd-shim
 cp -pr index.js package.json %{buildroot}%{nodejs_sitelib}/cmd-shim
 
 %nodejs_symlink_deps
 
-#%check
-#%nodejs_symlink_deps --check
-#%tap test/*.js
-
-%clean
-rm -rf %buildroot
+%if 0%{?enable_tests}
+%check
+%nodejs_symlink_deps --check
+%tap test/*.js
+%endif
 
 %files
-%defattr(-,root,root,-)
 %{nodejs_sitelib}/cmd-shim
-%doc README.md LICENSE
+%doc README.md
+%license LICENSE
 
 %changelog
+* Wed Jul 15 2015 Zuzana Svetlikova <zsvetlik@redhat.com> - 2.0.0-2
+- Enable tests
+- minor changes
+
 * Fri Jan 09 2015 Tomas Hrcka <thrcka@redhat.com> - 2.0.0-1
 - New upstream release 2.0.0