diff --git a/yast2-ntp-client-3.1.23.tar.bz2 b/yast2-ntp-client-3.1.23.tar.bz2
deleted file mode 100644
index 346ccf5..0000000
--- a/yast2-ntp-client-3.1.23.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e268f51b768c389069eb461f502af24215ad0edff2999a3cb876aaeff19acc5
-size 65302
diff --git a/yast2-ntp-client-3.1.25.tar.bz2 b/yast2-ntp-client-3.1.25.tar.bz2
new file mode 100644
index 0000000..4ea1a66
--- /dev/null
+++ b/yast2-ntp-client-3.1.25.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:726431d75bf1d45e8b7c1eb0ac2685d8a1e46476df6cee0a75c30932ed36e271
+size 76260
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index 0c9d4ce..29e9016 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jun  2 07:40:56 UTC 2016 - kanderssen@suse.com
+
+- Fixed Ntp Test adding a workaround to return false in case given
+  server is not reachable (bsc#977610)
+- Replaced old testsuite with Rspec tests
+- Added rubocop and coveralls
+- Removed autotools
+- 3.1.25
+
+-------------------------------------------------------------------
+Wed Jun  1 15:33:15 UTC 2016 - igonzalezsosa@suse.com
+
+- Drop yast2-ntp-client-devel-doc package (fate#320256)
+- 3.1.24
+
 -------------------------------------------------------------------
 Fri May  6 16:09:50 UTC 2016 - lslezak@suse.cz
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index b70dc60..cafe6d6 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.1.23
+Version:        3.1.25
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+
@@ -29,7 +29,9 @@ BuildRequires:  update-desktop-files
 BuildRequires:  yast2 >= 3.1.11
 BuildRequires:  yast2-country-data
 BuildRequires:  yast2-devtools >= 3.1.10
-BuildRequires:  yast2-testsuite
+BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
+BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
+
 #SLPAPI.pm 
 # Hostname::CurrentDomain
 # Wizard::SetDesktopTitleAndIcon
@@ -40,26 +42,21 @@ BuildArch:      noarch
 # New sntp command line syntax
 Conflicts:      ntp < 4.2.8
 
+Obsoletes:      yast2-ntp-client-devel-doc
+
 %description
 This package contains the YaST2 component for NTP client configuration.
 
-%package devel-doc
-Requires:       yast2-ntp-client = %version
-Summary:        YaST2 - NTP Client - Development Documentation
-Group:          System/YaST
-
-%description devel-doc
-This package contains development documentation for using the API
-provided by yast2-ntp-client package.
-
 %prep
 %setup -n %{name}-%{version}
 
+%check
+rake test:unit
+
 %build
-%yast_build
 
 %install
-%yast_install
+rake install DESTDIR="%{buildroot}"
 
 %files
 %defattr(-,root,root)
@@ -76,11 +73,7 @@ provided by yast2-ntp-client package.
 
 %dir %{yast_docdir}
 %doc %{yast_docdir}/COPYING
-%doc %{yast_docdir}/TODO
-%doc %{yast_docdir}/spec.txt
-
-%files devel-doc
-%doc %{yast_docdir}/autodocs
-%doc %{yast_docdir}/ntp.conf_agent.txt
+%doc %{yast_docdir}/README.md
+%doc %{yast_docdir}/CONTRIBUTING.md
 
 %changelog