diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
index 7b71b7d61cda..eaeb1ddc5bee 100644
--- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
+++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp
@@ -275,7 +275,7 @@ static LogicalResult checkConstantTypes(mlir::Operation *op, mlir::Type opType,
     return success();
   }
 
-  if (attrType.isa<IntegerAttr, FloatAttr>()) {
+  if (attrType.isa<mlir::cir::IntAttr, FloatAttr>()) {
     auto at = attrType.cast<TypedAttr>();
     if (at.getType() != opType) {
       return op->emitOpError("result type (")
diff --git a/clang/test/CIR/IR/int.cir b/clang/test/CIR/IR/int.cir
index 233198e4e335..3acaacd011f7 100644
--- a/clang/test/CIR/IR/int.cir
+++ b/clang/test/CIR/IR/int.cir
@@ -8,10 +8,10 @@
 !s32i = !cir.int<s, 32>
 !s64i = !cir.int<s, 64>
 
-!u8i = !cir.int<s, 8>
-!u16i = !cir.int<s, 16>
-!u32i = !cir.int<s, 32>
-!u64i = !cir.int<s, 64>
+!u8i = !cir.int<u, 8>
+!u16i = !cir.int<u, 16>
+!u32i = !cir.int<u, 32>
+!u64i = !cir.int<u, 64>
 
 cir.func @validIntTypesAndAttributes() -> () {
 
diff --git a/clang/test/CIR/IR/invalid.cir b/clang/test/CIR/IR/invalid.cir
index d353c7d7b878..386417ae2ffd 100644
--- a/clang/test/CIR/IR/invalid.cir
+++ b/clang/test/CIR/IR/invalid.cir
@@ -781,3 +781,12 @@ module {
   }
 }
 
+// -----
+
+!s8i = !cir.int<s, 8>
+!u8i = !cir.int<u, 8>
+cir.func @const_type_mismatch() -> () {
+    // expected-error@+1 {{'cir.const' op result type ('!cir.int<u, 8>') does not match value type ('!cir.int<s, 8>')}}
+    %2 = cir.const(#cir.int<0> : !s8i) : !u8i
+    cir.return
+}