diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql
index 387a5cb3751..6f57b5ae03c 100644
--- a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
+++ b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
@@ -22,19 +22,17 @@ class HashAlgorithmProvider extends RefType {
   }
 }
 
-/** The method call `ComputeHash()` declared in `System.Security.Cryptography.SHA...`. */
-class ComputeHashMethodCall extends MethodCall {
-  ComputeHashMethodCall() {
-    this.getQualifier().getType() instanceof SHA and
-    this.getTarget().hasName("ComputeHash")
-  }
-}
-
-/** The method call `ComputeHash()` declared in `System.Security.Cryptography.SHA...`. */
-class HashDataMethodCall extends MethodCall {
-  HashDataMethodCall() {
-    this.getQualifier().getType() instanceof HashAlgorithmProvider and
-    this.getTarget().hasName("HashData")
+/**
+ * The method `ComputeHash()` declared in `System.Security.Cryptography.SHA...` and
+ * the method `HashData()` declared in `Windows.Security.Cryptography.Core.HashAlgorithmProvider`.
+ */
+class HashMethod extends Method {
+  HashMethod() {
+    this.getDeclaringType() instanceof SHA and
+    this.hasName("ComputeHash")
+    or
+    this.getDeclaringType() instanceof HashAlgorithmProvider and
+    this.hasName("HashData")
   }
 }
 
@@ -55,11 +53,9 @@ class HashWithoutSaltConfiguration extends TaintTracking::Configuration {
   override predicate isSource(DataFlow::Node source) { source.asExpr() instanceof PasswordVarExpr }
 
   override predicate isSink(DataFlow::Node sink) {
-    exists(ComputeHashMethodCall mc |
-      sink.asExpr() = mc.getArgument(0) // sha256Hash.ComputeHash(rawDatabytes)
-    ) or
-    exists(HashDataMethodCall mc |
-      sink.asExpr() = mc.getArgument(0) // algProv.HashData(rawDatabytes)
+    exists(MethodCall mc |
+      sink.asExpr() = mc.getArgument(0) and
+      mc.getTarget() instanceof HashMethod
     )
   }
 
diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.cs b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.cs
rename to csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.cs
diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.expected b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.expected
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.expected
rename to csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.expected
diff --git a/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref
new file mode 100644
index 00000000000..3739b8998a4
--- /dev/null
+++ b/csharp/ql/test/experimental/Security Features/CWE-759/HashWithoutSalt.qlref	
@@ -0,0 +1 @@
+experimental/Security Features/CWE-759/HashWithoutSalt.ql
diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/Stubs.cs b/csharp/ql/test/experimental/Security Features/CWE-759/Stubs.cs
similarity index 100%
rename from csharp/ql/src/experimental/Security Features/CWE-759/Stubs.cs
rename to csharp/ql/test/experimental/Security Features/CWE-759/Stubs.cs