diff --git a/rust-threadpool.spec b/rust-threadpool.spec
index fbc386a..c0718ac 100644
--- a/rust-threadpool.spec
+++ b/rust-threadpool.spec
@@ -1,39 +1,58 @@
 # Generated by rust2rpm
-%bcond_without check
+%bcond_with check
 %global debug_package %{nil}
 
 %global crate threadpool
 
 Name:           rust-%{crate}
 Version:        1.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Thread pool for running a number of jobs on a fixed set of worker threads
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/threadpool
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+Source:         %{crates_source}
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(num_cpus) >= 1.6.0 with crate(num_cpus) < 2.0.0)
+BuildRequires:  (crate(num_cpus/default) >= 1.6.0 with crate(num_cpus/default) < 2.0.0)
 
-%description
-%{summary}.
+%global _description \
+A thread pool for running a number of jobs on a fixed set of worker threads.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A thread pool for running a number of jobs on a fixed set of worker threads.
+%description    devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md CHANGES.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -47,13 +66,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md CHANGES.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/appveyor.yml
-
 %changelog
+* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.7.1-6
+- Adapt to new packaging
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/tests/.fmf/version b/tests/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/tests/provision.fmf b/tests/provision.fmf
new file mode 100644
index 0000000..503a97c
--- /dev/null
+++ b/tests/provision.fmf
@@ -0,0 +1,5 @@
+---
+standard-inventory-qcow2:
+  qemu:
+    # `cargo test` usually eats more than 1G.
+    m: 4G
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..5a59e75
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    repositories:
+    - repo: "https://src.fedoraproject.org/tests/rust.git"
+      dest: rust
+    tests:
+    - rust/cargo-test
+    environment:
+      pkg: rust-threadpool