diff --git a/llvm/test/CodeGen/Generic/MachineBranchProb.ll b/llvm/test/CodeGen/Generic/MachineBranchProb.ll
index 85fafba227ae..b80d8b2e73c3 100644
--- a/llvm/test/CodeGen/Generic/MachineBranchProb.ll
+++ b/llvm/test/CodeGen/Generic/MachineBranchProb.ll
@@ -4,9 +4,6 @@
 ; to fail.
 ; XFAIL: hexagon
 
-; Bug: PR31899
-; XFAIL: avr
-
 declare void @foo()
 
 ; Make sure we have the correct weight attached to each successor.
diff --git a/llvm/test/CodeGen/Generic/print-mul-exp.ll b/llvm/test/CodeGen/Generic/print-mul-exp.ll
index 1426fb59f669..91c8147aaad9 100644
--- a/llvm/test/CodeGen/Generic/print-mul-exp.ll
+++ b/llvm/test/CodeGen/Generic/print-mul-exp.ll
@@ -1,5 +1,4 @@
 ; RUN: llc < %s
-; XFAIL: avr
 
 @a_str = internal constant [8 x i8] c"a = %d\0A\00"		; <[8 x i8]*> [#uses=1]
 @a_mul_str = internal constant [13 x i8] c"a * %d = %d\0A\00"		; <[13 x i8]*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/print-mul.ll b/llvm/test/CodeGen/Generic/print-mul.ll
index 20fb1be6edef..4b60d759278a 100644
--- a/llvm/test/CodeGen/Generic/print-mul.ll
+++ b/llvm/test/CodeGen/Generic/print-mul.ll
@@ -1,5 +1,4 @@
 ; RUN: llc < %s
-; XFAIL: avr
 
 @a_str = internal constant [8 x i8] c"a = %d\0A\00"		; <[8 x i8]*> [#uses=1]
 @b_str = internal constant [8 x i8] c"b = %d\0A\00"		; <[8 x i8]*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/print-shift.ll b/llvm/test/CodeGen/Generic/print-shift.ll
index 1fda55420b59..56b3ec1df760 100644
--- a/llvm/test/CodeGen/Generic/print-shift.ll
+++ b/llvm/test/CodeGen/Generic/print-shift.ll
@@ -1,5 +1,4 @@
 ; RUN: llc < %s
-; XFAIL: avr
 
 @a_str = internal constant [8 x i8] c"a = %d\0A\00"             ; <[8 x i8]*> [#uses=1]
 @b_str = internal constant [8 x i8] c"b = %d\0A\00"             ; <[8 x i8]*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/select-cc.ll b/llvm/test/CodeGen/Generic/select-cc.ll
index c67f57fde18b..2b39fc17a55d 100644
--- a/llvm/test/CodeGen/Generic/select-cc.ll
+++ b/llvm/test/CodeGen/Generic/select-cc.ll
@@ -1,8 +1,5 @@
 ; RUN: llc < %s
 
-; PR31338
-; XFAIL: avr
-
 define <2 x double> @vector_select(<2 x double> %x, <2 x double> %y) nounwind  {
 	%x.lo = extractelement <2 x double> %x, i32 0		; <double> [#uses=1]
 	%x.lo.ge = fcmp oge double %x.lo, 0.000000e+00		; <i1> [#uses=1]