diff --git a/obs-service-tar_scm.spec b/obs-service-tar_scm.spec
index b44c9b9..e93e384 100644
--- a/obs-service-tar_scm.spec
+++ b/obs-service-tar_scm.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package obs-service
+# spec file for package obs-service-tar_scm
 #
 # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
@@ -16,18 +16,17 @@
 #
 
 
-%define service tar_scm
-%define seperate_build 0
+%bcond_without obs_scm_testsuite
 
-Name:           obs-service-obs_scm
+Name:           obs-service-tar_scm
 %define version_unconverted 0.7.0.1490358243.8de854e
 Version:        0.7.0.1490358243.8de854e
 Release:        0
 Summary:        An OBS source service: checkout or update a tar ball from svn/git/hg
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Url:            https://github.com/openSUSE/obs-service-%{service}
-Source:         obs-service-tar_scm-%{version}.tar.gz
+Url:            https://github.com/openSUSE/obs-service-tar_scm
+Source:         %{name}-%{version}.tar.gz
 # Fix build on Ubuntu by disabling mercurial tests, not applied in rpm
 # based distributions
 #Patch0:         0001-Debianization-disable-running-mercurial-tests.patch
@@ -75,8 +74,8 @@ Provides:       obs-service-tar_scm:/usr/lib/obs/service/tar.service
 
 %description -n obs-service-tar
 
-%package -n     obs-service-tar_scm
-Summary:        Creates a tar ball from a remote SCM resource like git, subversion or cvs
+%package -n     obs-service-obs_scm
+Summary:        Creates a obs cpio archive from a remote SCM resource like git, subversion or cvs
 Group:          Development/Tools/Building
 Requires:       bzr
 Requires:       git-core
@@ -84,7 +83,7 @@ Requires:       mercurial
 Requires:       obs-service-obs_scm-common = %version-%release
 Requires:       subversion
 
-%description -n obs-service-tar_scm
+%description -n obs-service-obs_scm
 
 %package -n     obs-service-appimage
 Summary:        Handles source downloads defined in appimage.yml files
@@ -128,19 +127,14 @@ Requires:       python-PyYAML
 %install
 make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}"
 
-%if "%seperate_build" == "1"
-rm %{buildroot}/%{_prefix}/lib/obs/service/tar_scm.service
-rm %{buildroot}/%{_prefix}/lib/obs/service/obs_scm
-mv %{buildroot}/%{_prefix}/lib/obs/service/{tar,obs}_scm
-ln -sf obs_scm %{buildroot}/%{_prefix}/lib/obs/service/tar
-%endif
-
+%if %{with obs_scm_testsuite}
 %if 0%{?suse_version} >= 1220
 %check
 # No need to run PEP8 tests here; that would require a potentially
 # brittle BuildRequires: python-pep8, and any style issues are already
 # caught by Travis CI.
-#make test
+make test
+%endif
 %endif
 
 %files