diff --git a/rust-unicode-normalization.spec b/rust-unicode-normalization.spec
index 47201a4..25b73c4 100644
--- a/rust-unicode-normalization.spec
+++ b/rust-unicode-normalization.spec
@@ -1,36 +1,59 @@
 # Generated by rust2rpm
-%bcond_without check
+# * Tests are run in infrastructure
+%bcond_with check
 %global debug_package %{nil}
 
 %global crate unicode-normalization
 
 Name:           rust-%{crate}
 Version:        0.1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Functions for normalization of Unicode strings
 
+# Upstream license specification: MIT/Apache-2.0
 License:        MIT or ASL 2.0
 URL:            https://crates.io/crates/unicode-normalization
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+# Initial patched metadata
+# * Exclude unneeded scripts, https://github.com/unicode-rs/unicode-normalization/pull/30
+Patch0:         unicode-normalization-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 
-%description
-%{summary}.
+%global _description \
+This crate provides functions for normalization of Unicode strings,\
+including Canonical and Compatible Decomposition and Recomposition,\
+as described in Unicode Standard Annex #15.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-This crate provides functions for normalization of Unicode strings, including
-Canonical and Compatible Decomposition and Recomposition, as described in
-Unicode Standard Annex #15.
+%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 COPYRIGHT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%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
@@ -47,13 +70,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-MIT LICENSE-APACHE COPYRIGHT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/scripts
-
 %changelog
+* Sat Nov 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.7-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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..8fdda74
--- /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-unicode-normalization
diff --git a/unicode-normalization-fix-metadata.diff b/unicode-normalization-fix-metadata.diff
new file mode 100644
index 0000000..cba38ec
--- /dev/null
+++ b/unicode-normalization-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- unicode-normalization-0.1.7/Cargo.toml	1970-01-01T01:00:00+01:00
++++ unicode-normalization-0.1.7/Cargo.toml	2018-11-03T14:45:34.762287+01:00
+@@ -14,7 +14,7 @@
+ name = "unicode-normalization"
+ version = "0.1.7"
+ authors = ["kwantam <kwantam@gmail.com>"]
+-exclude = ["target/*", "Cargo.lock", "scripts/tmp", "*.txt"]
++exclude = ["target/*", "Cargo.lock", "scripts/*", "*.txt"]
+ description = "This crate provides functions for normalization of\nUnicode strings, including Canonical and Compatible\nDecomposition and Recomposition, as described in\nUnicode Standard Annex #15.\n"
+ homepage = "https://github.com/unicode-rs/unicode-normalization"
+ documentation = "https://unicode-rs.github.io/unicode-normalization"