diff --git a/cpp_demangle-fix-metadata.diff b/cpp_demangle-fix-metadata.diff
index 4dcc497..6cf5ec0 100644
--- a/cpp_demangle-fix-metadata.diff
+++ b/cpp_demangle-fix-metadata.diff
@@ -1,26 +1,11 @@
---- cpp_demangle-0.2.12/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ cpp_demangle-0.2.12/Cargo.toml	2018-11-02T18:54:42.881123+01:00
-@@ -35,10 +35,6 @@
- name = "afl_runner"
- path = "src/bin/afl_runner.rs"
- required-features = ["afl"]
--[dependencies.afl]
--version = "0.4"
--optional = true
--
- [dependencies.cfg-if]
- version = "0.1.4"
- [dev-dependencies.clap]
-@@ -51,12 +47,8 @@
+--- cpp_demangle-0.2.12/Cargo.toml	1970-01-01T00:00:00+00:00
++++ cpp_demangle-0.2.12/Cargo.toml	2019-05-07T15:06:17.445838+00:00
+@@ -47,7 +47,7 @@
+ [dev-dependencies.diff]
+ version = "0.1.10"
+ [build-dependencies.glob]
+-version = "0.2.11"
++version = "0.3"
  
  [features]
  alloc = []
--cppfilt = []
- default = ["std"]
--fuzz = ["afl"]
- logging = []
--nightly = []
--run_libiberty_tests = []
- std = []
- [badges.travis-ci]
- repository = "gimli-rs/cpp_demangle"
diff --git a/rust-cpp_demangle.spec b/rust-cpp_demangle.spec
index 54639e2..34fb027 100644
--- a/rust-cpp_demangle.spec
+++ b/rust-cpp_demangle.spec
@@ -1,5 +1,4 @@
-# Generated by rust2rpm
-# * Tests are run in infrastructure
+# Generated by rust2rpm-9-1.fc31
 %bcond_with check
 %global debug_package %{nil}
 
@@ -9,22 +8,22 @@
 
 Name:           rust-%{crate}
 Version:        0.2.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Crate for demangling C++ symbols
 
 # Upstream license specification: Apache-2.0/MIT
 License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/cpp_demangle
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+Source:         %{crates_source}
 # Initial patched metadata
-# * No afl, still not packaged
+# * Update glob to 0.3, https://github.com/gimli-rs/cpp_demangle/commit/a0a3038d73f9b85da08537e1a43a8745417bc3db
 Patch0:         cpp_demangle-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 BuildRequires:  (crate(cfg-if/default) >= 0.1.4 with crate(cfg-if/default) < 0.2.0)
-BuildRequires:  (crate(glob/default) >= 0.2.11 with crate(glob/default) < 0.3.0)
+BuildRequires:  (crate(glob/default) >= 0.3.0 with crate(glob/default) < 0.4.0)
 %if %{with check}
 BuildRequires:  (crate(clap/default) >= 2.27.1 with crate(clap/default) < 3.0.0)
 BuildRequires:  (crate(diff/default) >= 0.1.10 with crate(diff/default) < 0.2.0)
@@ -61,6 +60,18 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+afl-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+afl-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "afl" feature of "%{crate}" crate.
+
+%files       -n %{name}+afl-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %package     -n %{name}+alloc-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -73,6 +84,30 @@ which use "alloc" feature of "%{crate}" crate.
 %files       -n %{name}+alloc-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+cppfilt-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cppfilt-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "cppfilt" feature of "%{crate}" crate.
+
+%files       -n %{name}+cppfilt-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+fuzz-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+fuzz-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "fuzz" feature of "%{crate}" crate.
+
+%files       -n %{name}+fuzz-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %package     -n %{name}+logging-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -85,6 +120,30 @@ which use "logging" feature of "%{crate}" crate.
 %files       -n %{name}+logging-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+nightly-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "nightly" feature of "%{crate}" crate.
+
+%files       -n %{name}+nightly-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+run_libiberty_tests-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+run_libiberty_tests-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "run_libiberty_tests" feature of "%{crate}" crate.
+
+%files       -n %{name}+run_libiberty_tests-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %package     -n %{name}+std-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -98,7 +157,7 @@ which use "std" feature of "%{crate}" crate.
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -113,6 +172,9 @@ which use "std" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Tue May 07 17:06:18 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.2.12-4
+- Update glob to 0.3
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.12-3
 - 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..c440d33
--- /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-cpp_demangle