diff --git a/Cargo.toml b/Cargo.toml
index 1b684aca2..7df4e5ce0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -55,6 +55,7 @@ path = "src/lib.rs"
 
 [workspace]
 exclude = [
+  "cbindgen-macro",
   "tests/depfile/single_crate_config",
   "tests/depfile/single_crate_default_config",
   "tests/depfile/single_crate",
diff --git a/cbindgen-macro/Cargo.lock b/cbindgen-macro/Cargo.lock
new file mode 100644
index 000000000..81d9de8c8
--- /dev/null
+++ b/cbindgen-macro/Cargo.lock
@@ -0,0 +1,47 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "cbindgen-macro"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.111"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
diff --git a/cbindgen-macro/Cargo.toml b/cbindgen-macro/Cargo.toml
new file mode 100644
index 000000000..104e68192
--- /dev/null
+++ b/cbindgen-macro/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "cbindgen-macro"
+version = "0.1.0"
+edition = "2021"
+description = "Procedural macro attributes for cbindgen"
+license = "MPL-2.0"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0"
+quote = "1"
+syn = { version = "2.0", features = ["full"] }
diff --git a/cbindgen-macro/src/lib.rs b/cbindgen-macro/src/lib.rs
new file mode 100644
index 000000000..9aeac11fb
--- /dev/null
+++ b/cbindgen-macro/src/lib.rs
@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Procedural macro attributes for cbindgen.
+//!
+//! This crate provides the `#[cbindgen_macro::namespace()]` attribute that can be used
+//! to specify C++ namespaces for individual functions in generated headers.
+//!
+//! # Example
+//!
+//! ```rust,ignore
+//! use cbindgen_macro::namespace;
+//!
+//! #[namespace("ffi::bar")]
+//! #[no_mangle]
+//! pub extern "C" fn foo() {}
+//! ```
+//!
+//! The attribute itself is a no-op at compile time - it simply passes through
+//! the item unchanged. However, cbindgen parses this attribute from the source
+//! code to determine the C++ namespace for the function in the generated header.
+
+use proc_macro::TokenStream;
+
+/// Specifies a C++ namespace for a function in cbindgen-generated headers.
+///
+/// This attribute is a no-op at compile time but is parsed by cbindgen to
+/// determine where to place the function declaration in the generated C++ header.
+///
+/// # Example
+///
+/// ```rust,ignore
+/// #[cbindgen_macro::namespace("ffi::bar")]
+/// #[no_mangle]
+/// pub extern "C" fn foo() {}
+/// ```
+///
+/// This will generate the following C++ code:
+///
+/// ```cpp
+/// extern "C" {
+///
+/// namespace ffi {
+/// namespace bar {
+///
+/// void foo();
+///
+/// }  // namespace bar
+/// }  // namespace ffi
+///
+/// }  // extern "C"
+/// ```
+#[proc_macro_attribute]
+pub fn namespace(_attr: TokenStream, item: TokenStream) -> TokenStream {
+    // This is a no-op - we just pass through the item unchanged.
+    // cbindgen parses the attribute directly from the source code.
+    item
+}
diff --git a/docs.md b/docs.md
index aa071ac62..c2dc72c02 100644
--- a/docs.md
+++ b/docs.md
@@ -409,6 +409,49 @@ arg: *const T --> const T arg[]
 arg: *mut T --> T arg[]
 ```
 
+### Per-Item Namespace Attribute (C++ only)
+
+You can use the `#[cbindgen_macro::namespace("...")]` attribute to specify a C++ namespace for individual functions. This is useful when you want different functions to be placed in different namespaces.
+
+First, add the `cbindgen-macro` crate to your dependencies:
+
+```toml
+[dependencies]
+cbindgen-macro = { path = "path/to/cbindgen/cbindgen-macro" }
+```
+
+Then use the attribute on your functions:
+
+```rust
+#[cbindgen_macro::namespace("ffi::bar")]
+#[no_mangle]
+pub extern "C" fn foo(a: *const c_char) {}
+```
+
+This will generate the following C++ code:
+
+```cpp
+extern "C" {
+
+namespace ffi {
+namespace bar {
+
+void foo(const char *a);
+
+}  // namespace bar
+}  // namespace ffi
+
+}  // extern "C"
+```
+
+**Key points:**
+
+* Use `::` as the namespace separator (e.g., `"ffi::bar"` becomes nested namespaces `namespace ffi { namespace bar { ... } }`)
+* This attribute only affects C++ output; it is ignored for C and Cython output
+* Functions with the same namespace path will be grouped together in the generated header
+* If both a global `namespace` in `cbindgen.toml` and a per-item namespace attribute are specified, the per-item namespace is nested inside the global namespace
+* Functions without this attribute will use the global namespace (if configured) or no namespace
+
 ## Generating Swift Bindings
 
 In addition to parsing function names in C/C++ header files, the Swift compiler can make use of the `swift_name` attribute on functions to generate more idiomatic names for imported functions and methods.
diff --git a/src/bindgen/ir/function.rs b/src/bindgen/ir/function.rs
index f8e29c07c..48414b8bd 100644
--- a/src/bindgen/ir/function.rs
+++ b/src/bindgen/ir/function.rs
@@ -14,7 +14,7 @@ use crate::bindgen::library::Library;
 use crate::bindgen::monomorph::Monomorphs;
 use crate::bindgen::rename::{IdentifierType, RenameRule};
 use crate::bindgen::reserved;
-use crate::bindgen::utilities::IterHelpers;
+use crate::bindgen::utilities::{IterHelpers, SynAttributeHelpers};
 
 #[derive(Debug, Clone)]
 pub struct FunctionArgument {
@@ -36,6 +36,9 @@ pub struct Function {
     pub annotations: AnnotationSet,
     pub documentation: Documentation,
     pub never_return: bool,
+    /// Per-item C++ namespace path from `#[cbindgen::namespace = "..."]` attribute.
+    /// For example, `["ffi", "bar"]` for `#[cbindgen::namespace = "ffi::bar"]`.
+    pub namespace: Option<Vec<String>>,
 }
 
 impl Function {
@@ -65,6 +68,9 @@ impl Function {
             ret.replace_self_with(self_path);
         }
 
+        // Parse the #[cbindgen::namespace = "..."] attribute
+        let namespace = attrs.get_cbindgen_namespace();
+
         Ok(Function {
             path,
             self_type_path: self_type_path.cloned(),
@@ -75,6 +81,7 @@ impl Function {
             annotations: AnnotationSet::load(attrs)?,
             documentation: Documentation::load(attrs),
             never_return,
+            namespace,
         })
     }
 
diff --git a/src/bindgen/language_backend/clike.rs b/src/bindgen/language_backend/clike.rs
index dba5a10ac..a589262c2 100644
--- a/src/bindgen/language_backend/clike.rs
+++ b/src/bindgen/language_backend/clike.rs
@@ -1,13 +1,14 @@
 use crate::bindgen::ir::{
     to_known_assoc_constant, ConditionWrite, DeprecatedNoteKind, Documentation, Enum, EnumVariant,
-    Field, GenericParams, Item, Literal, OpaqueItem, ReprAlign, Static, Struct, ToCondition, Type,
-    Typedef, Union,
+    Field, Function, GenericParams, Item, Literal, OpaqueItem, ReprAlign, Static, Struct,
+    ToCondition, Type, Typedef, Union,
 };
 use crate::bindgen::language_backend::LanguageBackend;
 use crate::bindgen::rename::IdentifierType;
 use crate::bindgen::writer::{ListType, SourceWriter};
 use crate::bindgen::{cdecl, Bindings, Config, Language};
 use crate::bindgen::{DocumentationLength, DocumentationStyle};
+use std::collections::BTreeMap;
 use std::io::Write;
 
 pub struct CLikeLanguageBackend<'a> {
@@ -116,6 +117,81 @@ impl<'a> CLikeLanguageBackend<'a> {
         self.config.language == Language::C && self.config.style.generate_typedef()
     }
 
+    /// Writes functions, grouping those with per-item namespace attributes into
+    /// nested namespace blocks (for C++ output only).
+    fn write_functions_with_namespaces<W: Write>(
+        &mut self,
+        out: &mut SourceWriter<W>,
+        b: &Bindings,
+    ) where
+        Self: LanguageBackend,
+    {
+        // Only apply per-item namespace grouping for C++ output
+        if b.config.language != Language::Cxx {
+            self.write_functions_default(out, b);
+            return;
+        }
+
+        // Group functions by their per-item namespace
+        // Functions without a namespace go to the `None` key
+        let mut grouped: BTreeMap<Option<Vec<String>>, Vec<&Function>> = BTreeMap::new();
+
+        for function in &b.functions {
+            if !function.annotations.should_export() {
+                continue;
+            }
+            grouped
+                .entry(function.namespace.clone())
+                .or_default()
+                .push(function);
+        }
+
+        // Write functions without per-item namespace first (they use global namespace)
+        if let Some(functions) = grouped.remove(&None) {
+            for function in functions {
+                out.new_line_if_not_start();
+                self.write_function(&b.config, out, function);
+                out.new_line();
+            }
+        }
+
+        // Write functions with per-item namespaces
+        for (namespace, functions) in grouped {
+            if let Some(ns_parts) = namespace {
+                if ns_parts.is_empty() {
+                    // Empty namespace means no namespace wrapping
+                    for function in functions {
+                        out.new_line_if_not_start();
+                        self.write_function(&b.config, out, function);
+                        out.new_line();
+                    }
+                } else {
+                    // Open nested namespaces
+                    out.new_line_if_not_start();
+                    for ns in &ns_parts {
+                        out.new_line();
+                        write!(out, "namespace {ns} {{");
+                    }
+                    out.new_line();
+
+                    // Write functions inside the namespace
+                    for function in functions {
+                        out.new_line_if_not_start();
+                        self.write_function(&b.config, out, function);
+                        out.new_line();
+                    }
+
+                    // Close nested namespaces in reverse order
+                    for ns in ns_parts.iter().rev() {
+                        out.new_line();
+                        write!(out, "}}  // namespace {ns}");
+                    }
+                    out.new_line();
+                }
+            }
+        }
+    }
+
     fn write_derived_cpp_ops<W: Write>(&mut self, out: &mut SourceWriter<W>, s: &Struct) {
         let mut wrote_start_newline = false;
 
@@ -990,7 +1066,7 @@ impl LanguageBackend for CLikeLanguageBackend<'_> {
         // Override default method to close various blocks containing both globals and functions
         // these blocks are opened in [`write_globals`] that is also overridden
         if !b.functions.is_empty() || !b.globals.is_empty() {
-            self.write_functions_default(out, b);
+            self.write_functions_with_namespaces(out, b);
 
             if b.config.cpp_compatible_c() {
                 out.new_line();
diff --git a/src/bindgen/utilities.rs b/src/bindgen/utilities.rs
index 8f0763b83..30b03a69a 100644
--- a/src/bindgen/utilities.rs
+++ b/src/bindgen/utilities.rs
@@ -294,6 +294,42 @@ pub trait SynAttributeHelpers {
             .next()
     }
 
+    /// Looks up the `#[cbindgen::namespace("...")]` or `#[cbindgen_macro::namespace("...")]`
+    /// attribute and parses it into a vector of namespace segments.
+    /// Supports `::` as the separator.
+    /// For example, `"ffi::bar"` becomes `["ffi", "bar"]`.
+    fn get_cbindgen_namespace(&self) -> Option<Vec<String>> {
+        for attr in self.attrs() {
+            // Handle #[cbindgen_macro::namespace("...")] or #[cbindgen::namespace("...")] syntax
+            if let syn::Meta::List(syn::MetaList { path, tokens, .. }) = &attr.meta {
+                if path.segments.len() == 2 {
+                    let first = &path.segments[0];
+                    let second = &path.segments[1];
+                    let first_ident = first.ident.to_string();
+                    if (first_ident == "cbindgen" || first_ident == "cbindgen_macro")
+                        && second.ident == "namespace"
+                    {
+                        // Parse the tokens inside the parentheses as a string literal
+                        let tokens_str = tokens.to_string();
+                        // Remove surrounding quotes if present
+                        let value = tokens_str.trim_matches('"').to_string();
+                        if value.is_empty() {
+                            return Some(Vec::new());
+                        }
+                        // Split by "::" separator
+                        let segments: Vec<String> = value
+                            .split("::")
+                            .map(|s| s.trim().to_string())
+                            .filter(|s| !s.is_empty())
+                            .collect();
+                        return Some(segments);
+                    }
+                }
+            }
+        }
+        None
+    }
+
     fn get_comment_lines(&self) -> Vec<String> {
         let mut comment = Vec::new();
 
diff --git a/tests/expectations-symbols/namespace_attr.c.sym b/tests/expectations-symbols/namespace_attr.c.sym
new file mode 100644
index 000000000..a99e909a4
--- /dev/null
+++ b/tests/expectations-symbols/namespace_attr.c.sym
@@ -0,0 +1,7 @@
+{
+global_function;
+ffi_function;
+nested_function;
+another_nested_function;
+other_namespace_function;
+};
\ No newline at end of file
diff --git a/tests/expectations-symbols/namespace_attr_precedence.c.sym b/tests/expectations-symbols/namespace_attr_precedence.c.sym
new file mode 100644
index 000000000..27afd8679
--- /dev/null
+++ b/tests/expectations-symbols/namespace_attr_precedence.c.sym
@@ -0,0 +1,5 @@
+{
+uses_global_namespace;
+uses_item_namespace;
+also_uses_global_namespace;
+};
\ No newline at end of file
diff --git a/tests/expectations/namespace_attr.c b/tests/expectations/namespace_attr.c
new file mode 100644
index 000000000..f41467493
--- /dev/null
+++ b/tests/expectations/namespace_attr.c
@@ -0,0 +1,29 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * A function without namespace attribute - uses global namespace
+ */
+void global_function(void);
+
+/**
+ * A function with a single namespace
+ */
+void ffi_function(void);
+
+/**
+ * A function with nested namespaces using :: separator
+ */
+void nested_function(const char *a);
+
+/**
+ * Another function with the same namespace to test grouping
+ */
+void another_nested_function(void);
+
+/**
+ * A function with a different nested namespace
+ */
+void other_namespace_function(void);
diff --git a/tests/expectations/namespace_attr.compat.c b/tests/expectations/namespace_attr.compat.c
new file mode 100644
index 000000000..bbdad1229
--- /dev/null
+++ b/tests/expectations/namespace_attr.compat.c
@@ -0,0 +1,37 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/**
+ * A function without namespace attribute - uses global namespace
+ */
+void global_function(void);
+
+/**
+ * A function with a single namespace
+ */
+void ffi_function(void);
+
+/**
+ * A function with nested namespaces using :: separator
+ */
+void nested_function(const char *a);
+
+/**
+ * Another function with the same namespace to test grouping
+ */
+void another_nested_function(void);
+
+/**
+ * A function with a different nested namespace
+ */
+void other_namespace_function(void);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
diff --git a/tests/expectations/namespace_attr.cpp b/tests/expectations/namespace_attr.cpp
new file mode 100644
index 000000000..79502581f
--- /dev/null
+++ b/tests/expectations/namespace_attr.cpp
@@ -0,0 +1,43 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+extern "C" {
+
+/// A function without namespace attribute - uses global namespace
+void global_function();
+
+
+namespace ffi {
+
+/// A function with a single namespace
+void ffi_function();
+
+}  // namespace ffi
+
+
+namespace ffi {
+namespace inner {
+
+/// A function with nested namespaces using :: separator
+void nested_function(const char *a);
+
+/// Another function with the same namespace to test grouping
+void another_nested_function();
+
+}  // namespace inner
+}  // namespace ffi
+
+
+namespace other {
+namespace ns {
+
+/// A function with a different nested namespace
+void other_namespace_function();
+
+}  // namespace ns
+}  // namespace other
+
+}  // extern "C"
diff --git a/tests/expectations/namespace_attr.pyx b/tests/expectations/namespace_attr.pyx
new file mode 100644
index 000000000..866181c81
--- /dev/null
+++ b/tests/expectations/namespace_attr.pyx
@@ -0,0 +1,22 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # A function without namespace attribute - uses global namespace
+  void global_function();
+
+  # A function with a single namespace
+  void ffi_function();
+
+  # A function with nested namespaces using :: separator
+  void nested_function(const char *a);
+
+  # Another function with the same namespace to test grouping
+  void another_nested_function();
+
+  # A function with a different nested namespace
+  void other_namespace_function();
diff --git a/tests/expectations/namespace_attr_precedence.c b/tests/expectations/namespace_attr_precedence.c
new file mode 100644
index 000000000..0f07d7540
--- /dev/null
+++ b/tests/expectations/namespace_attr_precedence.c
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+/**
+ * A function without namespace attribute - should use global namespace
+ */
+void uses_global_namespace(void);
+
+/**
+ * A function with per-item namespace - should override global namespace
+ */
+void uses_item_namespace(const char *a);
+
+/**
+ * Another function without namespace attribute - should use global namespace
+ */
+void also_uses_global_namespace(void);
diff --git a/tests/expectations/namespace_attr_precedence.compat.c b/tests/expectations/namespace_attr_precedence.compat.c
new file mode 100644
index 000000000..beec9f309
--- /dev/null
+++ b/tests/expectations/namespace_attr_precedence.compat.c
@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+namespace global_ns {
+#endif  // __cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+/**
+ * A function without namespace attribute - should use global namespace
+ */
+void uses_global_namespace(void);
+
+/**
+ * A function with per-item namespace - should override global namespace
+ */
+void uses_item_namespace(const char *a);
+
+/**
+ * Another function without namespace attribute - should use global namespace
+ */
+void also_uses_global_namespace(void);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+
+#ifdef __cplusplus
+}  // namespace global_ns
+#endif  // __cplusplus
diff --git a/tests/expectations/namespace_attr_precedence.cpp b/tests/expectations/namespace_attr_precedence.cpp
new file mode 100644
index 000000000..7a52ecce5
--- /dev/null
+++ b/tests/expectations/namespace_attr_precedence.cpp
@@ -0,0 +1,29 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+namespace global_ns {
+
+extern "C" {
+
+/// A function without namespace attribute - should use global namespace
+void uses_global_namespace();
+
+/// Another function without namespace attribute - should use global namespace
+void also_uses_global_namespace();
+
+
+namespace ffi {
+namespace bar {
+
+/// A function with per-item namespace - should override global namespace
+void uses_item_namespace(const char *a);
+
+}  // namespace bar
+}  // namespace ffi
+
+}  // extern "C"
+
+}  // namespace global_ns
diff --git a/tests/expectations/namespace_attr_precedence.pyx b/tests/expectations/namespace_attr_precedence.pyx
new file mode 100644
index 000000000..a820fa2fa
--- /dev/null
+++ b/tests/expectations/namespace_attr_precedence.pyx
@@ -0,0 +1,16 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  # A function without namespace attribute - should use global namespace
+  void uses_global_namespace();
+
+  # A function with per-item namespace - should override global namespace
+  void uses_item_namespace(const char *a);
+
+  # Another function without namespace attribute - should use global namespace
+  void also_uses_global_namespace();
diff --git a/tests/rust/dep_v2/dep/Cargo.lock b/tests/rust/dep_v2/dep/Cargo.lock
new file mode 100644
index 000000000..3d317db2d
--- /dev/null
+++ b/tests/rust/dep_v2/dep/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "dep-2-dep"
+version = "0.1.0"
diff --git a/tests/rust/expand_dep/dep/Cargo.lock b/tests/rust/expand_dep/dep/Cargo.lock
new file mode 100644
index 000000000..62600eea8
--- /dev/null
+++ b/tests/rust/expand_dep/dep/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "dep"
+version = "0.1.0"
diff --git a/tests/rust/expand_dep_v2/dep/Cargo.lock b/tests/rust/expand_dep_v2/dep/Cargo.lock
new file mode 100644
index 000000000..b12ea1a62
--- /dev/null
+++ b/tests/rust/expand_dep_v2/dep/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "expand-dep-2-dep"
+version = "0.1.0"
diff --git a/tests/rust/expand_dep_v2/dep_v2/Cargo.lock b/tests/rust/expand_dep_v2/dep_v2/Cargo.lock
new file mode 100644
index 000000000..824b0d61a
--- /dev/null
+++ b/tests/rust/expand_dep_v2/dep_v2/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "expand-dep-2-dep-2"
+version = "0.2.0"
diff --git a/tests/rust/namespace_attr.rs b/tests/rust/namespace_attr.rs
new file mode 100644
index 000000000..c2ee1c0fc
--- /dev/null
+++ b/tests/rust/namespace_attr.rs
@@ -0,0 +1,25 @@
+use std::os::raw::c_char;
+
+/// A function without namespace attribute - uses global namespace
+#[no_mangle]
+pub extern "C" fn global_function() {}
+
+/// A function with a single namespace
+#[cbindgen_macro::namespace("ffi")]
+#[no_mangle]
+pub extern "C" fn ffi_function() {}
+
+/// A function with nested namespaces using :: separator
+#[cbindgen_macro::namespace("ffi::inner")]
+#[no_mangle]
+pub extern "C" fn nested_function(a: *const c_char) {}
+
+/// Another function with the same namespace to test grouping
+#[cbindgen_macro::namespace("ffi::inner")]
+#[no_mangle]
+pub extern "C" fn another_nested_function() {}
+
+/// A function with a different nested namespace
+#[cbindgen_macro::namespace("other::ns")]
+#[no_mangle]
+pub extern "C" fn other_namespace_function() {}
diff --git a/tests/rust/namespace_attr.toml b/tests/rust/namespace_attr.toml
new file mode 100644
index 000000000..9ccd3e39e
--- /dev/null
+++ b/tests/rust/namespace_attr.toml
@@ -0,0 +1 @@
+language = "C++"
diff --git a/tests/rust/namespace_attr_precedence.rs b/tests/rust/namespace_attr_precedence.rs
new file mode 100644
index 000000000..0b15b46a9
--- /dev/null
+++ b/tests/rust/namespace_attr_precedence.rs
@@ -0,0 +1,14 @@
+use std::os::raw::c_char;
+
+/// A function without namespace attribute - should use global namespace
+#[no_mangle]
+pub extern "C" fn uses_global_namespace() {}
+
+/// A function with per-item namespace - should override global namespace
+#[cbindgen_macro::namespace("ffi::bar")]
+#[no_mangle]
+pub extern "C" fn uses_item_namespace(a: *const c_char) {}
+
+/// Another function without namespace attribute - should use global namespace
+#[no_mangle]
+pub extern "C" fn also_uses_global_namespace() {}
diff --git a/tests/rust/namespace_attr_precedence.toml b/tests/rust/namespace_attr_precedence.toml
new file mode 100644
index 000000000..072d4a6b6
--- /dev/null
+++ b/tests/rust/namespace_attr_precedence.toml
@@ -0,0 +1,2 @@
+language = "C++"
+namespace = "global_ns"
diff --git a/tests/rust/rename_crate/dependency/Cargo.lock b/tests/rust/rename_crate/dependency/Cargo.lock
new file mode 100644
index 000000000..6689b8a83
--- /dev/null
+++ b/tests/rust/rename_crate/dependency/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "dependency"
+version = "0.1.0"
diff --git a/tests/rust/rename_crate/no_extern/Cargo.lock b/tests/rust/rename_crate/no_extern/Cargo.lock
index 3f7f59a28..7a75a3b84 100644
--- a/tests/rust/rename_crate/no_extern/Cargo.lock
+++ b/tests/rust/rename_crate/no_extern/Cargo.lock
@@ -1,6 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 4
+
 [[package]]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
-
diff --git a/tests/rust/rename_crate/old_dep/Cargo.lock b/tests/rust/rename_crate/old_dep/Cargo.lock
index e572f8ffb..79298a683 100644
--- a/tests/rust/rename_crate/old_dep/Cargo.lock
+++ b/tests/rust/rename_crate/old_dep/Cargo.lock
@@ -1,13 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 4
+
 [[package]]
-name = "no-extern"
+name = "no_extern"
 version = "0.1.0"
 
 [[package]]
-name = "old-dep-name"
+name = "old_dep_name"
 version = "0.1.0"
 dependencies = [
- "no-extern 0.1.0",
+ "no_extern",
 ]
-