diff --git a/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
index b480c14203c..969950dfaab 100644
--- a/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
+++ b/jadx-core/src/test/java/jadx/tests/api/IntegrationTest.java
@@ -247,7 +247,7 @@ void compile(ClassNode cls) {
 	}
 
 	public Object invoke(String method) throws Exception {
-		return invoke(method, new Class[0]);
+		return invoke(method, new Class<?>[0]);
 	}
 
 	public Object invoke(String method, Class[] types, Object... args) throws Exception {
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java b/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
index 4f8df7e3bd5..dd1ed8099eb 100644
--- a/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
+++ b/jadx-core/src/test/java/jadx/tests/api/compiler/ClassFileManager.java
@@ -35,7 +35,7 @@ public ClassLoader getClassLoader(Location location) {
 
 	private class DynamicClassLoader extends SecureClassLoader {
 		private final Map<String, JavaClassObject> clsMap = new HashMap<String, JavaClassObject>();
-		private final Map<String, Class> clsCache = new HashMap<String, Class>();
+		private final Map<String, Class<?>> clsCache = new HashMap<String, Class<?>>();
 
 		@Override
 		protected Class<?> findClass(String name) throws ClassNotFoundException {
@@ -55,7 +55,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
 		}
 
 		public Class<?> replaceClass(String name) throws ClassNotFoundException {
-			Class cacheCls = clsCache.get(name);
+			Class<?> cacheCls = clsCache.get(name);
 			if (cacheCls != null) {
 				return cacheCls;
 			}
diff --git a/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java b/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java
index 20d0d849713..427d8cb8d99 100644
--- a/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java
+++ b/jadx-core/src/test/java/jadx/tests/api/compiler/DynamicCompiler.java
@@ -58,7 +58,7 @@ private Object getInstance() throws Exception {
 	}
 
 	public Method getMethod(String method, Class[] types) throws Exception {
-		for (Class type : types) {
+		for (Class<?> type : types) {
 			checkType(type);
 		}
 		return getInstance().getClass().getMethod(method, types);
@@ -68,7 +68,7 @@ public Object invoke(Method mth, Object... args) throws Exception {
 		return mth.invoke(getInstance(), args);
 	}
 
-	private Class<?> checkType(Class type) throws ClassNotFoundException {
+	private Class<?> checkType(Class<?> type) throws ClassNotFoundException {
 		if (type.isPrimitive()) {
 			return type;
 		}
diff --git a/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java b/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
index fad1733523d..90e1cf3f94c 100644
--- a/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
+++ b/jadx-core/src/test/java/jadx/tests/functional/JadxVisitorsOrderTest.java
@@ -34,7 +34,7 @@ public void testOrder() {
 	}
 
 	private static List<String> check(List<IDexTreeVisitor> passes) {
-		List<Class> classList = new ArrayList<Class>(passes.size());
+		List<Class<?>> classList = new ArrayList<Class<?>>(passes.size());
 		for (IDexTreeVisitor pass : passes) {
 			classList.add(pass.getClass());
 		}
diff --git a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
index 2d5a6ca6ab9..2df56df6952 100644
--- a/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
+++ b/jadx-core/src/test/java/jadx/tests/integration/others/TestIssue13a.java
@@ -15,8 +15,8 @@ public class TestIssue13a extends IntegrationTest {
 
 	public static class TestCls {
 		private static final String TAG = "Parcel";
-		private static final HashMap<ClassLoader, HashMap<String, Parcelable.Creator>>
-				mCreators = new HashMap<ClassLoader, HashMap<String, Parcelable.Creator>>();
+		private static final HashMap<ClassLoader, HashMap<String, Parcelable.Creator<?>>>
+				mCreators = new HashMap<ClassLoader, HashMap<String, Parcelable.Creator<?>>>();
 
 		@SuppressWarnings("unchecked")
 		public final <T extends Parcelable> T test(ClassLoader loader) {
@@ -26,15 +26,15 @@ public final <T extends Parcelable> T test(ClassLoader loader) {
 			}
 			Parcelable.Creator<T> creator;
 			synchronized (mCreators) {
-				HashMap<String, Parcelable.Creator> map = mCreators.get(loader);
+				HashMap<String, Parcelable.Creator<?>> map = mCreators.get(loader);
 				if (map == null) {
-					map = new HashMap<String, Parcelable.Creator>();
+					map = new HashMap<String, Parcelable.Creator<?>>();
 					mCreators.put(loader, map);
 				}
-				creator = map.get(name);
+				creator = (Parcelable.Creator<T>) map.get(name);
 				if (creator == null) {
 					try {
-						Class c = loader == null ?
+						Class<?> c = loader == null ?
 								Class.forName(name) : Class.forName(name, true, loader);
 						Field f = c.getField("CREATOR");
 						creator = (Parcelable.Creator) f.get(null);
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
index 74eaa29ad1e..cb996bc9e90 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
@@ -71,7 +71,7 @@ private JResource getResourceByName(JResource rf, String name) {
 	}
 
 	public JNode searchClassInTree(JNode node) {
-		Enumeration en = this.breadthFirstEnumeration();
+		Enumeration<?> en = this.breadthFirstEnumeration();
 		while (en.hasMoreElements()) {
 			Object obj = en.nextElement();
 			if (node.equals(obj)) {
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java b/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java
index 68033e22797..9ae8f801b96 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/LogViewer.java
@@ -41,6 +41,7 @@ public final void initUI() {
 
 		JPanel controlPane = new JPanel();
 		controlPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+		@SuppressWarnings("unchecked")
 		final JComboBox cb = new JComboBox(LEVEL_ITEMS);
 		cb.setSelectedItem(level);
 		cb.addActionListener(new ActionListener() {